Merge branch 'develop' into feature/credit_calc

# Conflicts: # app/Factory/TransactionJournalMetaFactory.php # app/Repositories/Account/AccountRepository.php # app/Transformers/AccountTransformer.php # config/firefly.php # frontend/src/components/accounts/Create.vue
2025-09-05 04:03:26 +00:00 · 2021-04-27 06:54:38 +02:00
parent 8ef6595ced f03b0569cf
commit 65c49c7a71
259 changed files with 3163 additions and 2520 deletions
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -39,9 +39,7 @@ use Log;
 */
 class LinkController extends Controller
 {
-
-    /** @var LinkTypeRepositoryInterface */
-    private $repository;
+    private LinkTypeRepositoryInterface $repository;

    /**
     * LinkController constructor.
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -23,6 +23,7 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Controllers\Admin;

+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Update\UpdateTrait;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -62,8 +63,7 @@ class UpdateController extends Controller
     * Show page with update options.
     *
     * @return Factory|View
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
+     * @throws FireflyException
     */
    public function index()
    {
--- a/app/Http/Controllers/Auth/TwoFactorController.php
+++ b/app/Http/Controllers/Auth/TwoFactorController.php
@@ -59,7 +59,7 @@ class TwoFactorController extends Controller
    {
        /** @var array $mfaHistory */
        $mfaHistory = Preferences::get('mfa_history', [])->data;
-        $mfaCode    = $request->get('one_time_password');
+        $mfaCode    = (string)$request->get('one_time_password');

        // is in history? then refuse to use it.
        if ($this->inMFAHistory($mfaCode, $mfaHistory)) {
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -159,7 +159,6 @@ class IndexController extends Controller
                    continue;
                }

-                /** @var TransactionCurrency $currency */
                $currencyId                     = $bill['currency_id'];
                $sums[$groupOrder][$currencyId] = $sums[$groupOrder][$currencyId] ?? [
                        'currency_id'             => $currencyId,
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -135,16 +135,21 @@ class BudgetLimitController extends Controller
        if (null === $currency || null === $budget) {
            throw new FireflyException('No valid currency or budget.');
        }
-        $start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
-        $end   = Carbon::createFromFormat('Y-m-d', $request->get('end'));
+        $start  = Carbon::createFromFormat('Y-m-d', $request->get('start'));
+        $end    = Carbon::createFromFormat('Y-m-d', $request->get('end'));
+        $amount = (string)$request->get('amount');
        $start->startOfDay();
        $end->startOfDay();

+        if ('' === $amount) {
+            return response()->json([]);
+        }
+
        Log::debug(sprintf('Start: %s, end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));

        $limit = $this->blRepository->find($budget, $currency, $start, $end);
        if (null !== $limit) {
-            $limit->amount = $request->get('amount');
+            $limit->amount = $amount;
            $limit->save();
        }
        if (null === $limit) {
@@ -154,7 +159,7 @@ class BudgetLimitController extends Controller
                    'currency_id' => (int)$request->get('transaction_currency_id'),
                    'start_date'  => $start,
                    'end_date'    => $end,
-                    'amount'      => $request->get('amount'),
+                    'amount'      => $amount,
                ]
            );
        }
@@ -176,7 +181,7 @@ class BudgetLimitController extends Controller
            return response()->json($array);
        }

-        return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
+        return response()->json([]);
    }

    /**
@@ -187,7 +192,10 @@ class BudgetLimitController extends Controller
     */
    public function update(Request $request, BudgetLimit $budgetLimit): JsonResponse
    {
-        $amount = $request->get('amount');
+        $amount = (string)$request->get('amount');
+        if ('' === $amount) {
+            $amount = '0';
+        }

        $limit = $this->blRepository->update($budgetLimit, ['amount' => $amount]);
        $array = $limit->toArray();
--- a/app/Http/Controllers/Budget/ShowController.php
+++ b/app/Http/Controllers/Budget/ShowController.php
@@ -144,7 +144,7 @@ class ShowController extends Controller
     */
    public function show(Request $request, Budget $budget)
    {
-        /** @var Carbon $start */
+        /** @var Carbon $allStart */
        $allStart    = session('first', Carbon::now()->startOfYear());
        $allEnd      = today();
        $page        = (int)$request->get('page');
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -108,7 +108,7 @@ class BudgetController extends Controller
        $currencies     = [];
        $defaultEntries = [];
        while ($end >= $loopStart) {
-            /** @var Carbon $currentEnd */
+            /** @var Carbon $loopEnd */
            $loopEnd = app('navigation')->endOfPeriod($loopStart, $step);
            $spent   = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection);
            $label   = trim(app('navigation')->periodShow($loopStart, $step));
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -76,7 +76,7 @@ class CategoryController extends Controller
        $cache->addProperty('chart.category.all');
        $cache->addProperty($category->id);
        if ($cache->has()) {
-            return response()->json($cache->get()); 
+            return response()->json($cache->get());
        }
        /** @var CategoryRepositoryInterface $repository */
        $repository = app(CategoryRepositoryInterface::class);
@@ -125,7 +125,7 @@ class CategoryController extends Controller
        $cache->addProperty($end);
        $cache->addProperty('chart.category.frontpage');
        if ($cache->has()) {
-            return response()->json($cache->get()); 
+            return response()->json($cache->get());
        }

        $frontPageGenerator = new FrontpageChartGenerator($start, $end);
@@ -270,7 +270,7 @@ class CategoryController extends Controller
        $cache->addProperty('chart.category.period.no-cat');
        $cache->addProperty($accounts->pluck('id')->toArray());
        if ($cache->has()) {
-            return response()->json($cache->get()); 
+            return response()->json($cache->get());
        }
        $data = $this->reportPeriodChart($accounts, $start, $end, null);

@@ -283,8 +283,8 @@ class CategoryController extends Controller
     * Chart for a specific period.
     * TODO test method, for category refactor.
     *
-     * @param Category                    $category
-     * @param                             $date
+     * @param Category $category
+     * @param Carbon   $date
     *
     * @return JsonResponse
     */
@@ -294,7 +294,7 @@ class CategoryController extends Controller
        $start = app('navigation')->startOfPeriod($date, $range);
        $end   = session()->get('end');
        if ($end < $start) {
-            [$end, $start] = [$start, $end]; 
+            [$end, $start] = [$start, $end];
        }

        $cache = new CacheProperties;
@@ -303,7 +303,7 @@ class CategoryController extends Controller
        $cache->addProperty($category->id);
        $cache->addProperty('chart.category.period-chart');
        if ($cache->has()) {
-            return response()->json($cache->get()); 
+            return response()->json($cache->get());
        }

        /** @var WholePeriodChartGenerator $chartGenerator */
--- a/app/Http/Controllers/Chart/CategoryReportController.php
+++ b/app/Http/Controllers/Chart/CategoryReportController.php
@@ -140,10 +140,8 @@ class CategoryReportController extends Controller
     * @param Collection $categories
     * @param Carbon     $start
     * @param Carbon     $end
-     * @param string     $others
     *
     * @return JsonResponse
-     *
     */
    public function categoryIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): JsonResponse
    {
--- a/app/Http/Controllers/Chart/PiggyBankController.php
+++ b/app/Http/Controllers/Chart/PiggyBankController.php
@@ -80,9 +80,9 @@ class PiggyBankController extends Controller
        $locale = app('steam')->getLocale();

        // get first event or start date of piggy bank or today
-        $startDate = $piggyBank->start_date ?? today(config('app.timezone'));
+        $startDate = $piggyBank->startdate ?? today(config('app.timezone'));

-        /** @var PiggyBankEvent $first */
+        /** @var PiggyBankEvent $firstEvent */
        $firstEvent = $set->first();
        $firstDate  = null === $firstEvent ? new Carbon : $firstEvent->date;

--- a/app/Http/Controllers/Chart/TransactionController.php
+++ b/app/Http/Controllers/Chart/TransactionController.php
@@ -52,12 +52,10 @@ class TransactionController extends Controller
    }

    /**
-     * @param string $objectType
     * @param Carbon $start
     * @param Carbon $end
     *
     * @return JsonResponse
-     * @throws FireflyException
     */
    public function budgets(Carbon $start, Carbon $end)
    {
--- a/app/Http/Controllers/HelpController.php
+++ b/app/Http/Controllers/HelpController.php
@@ -32,7 +32,7 @@ class HelpController extends Controller
    /**
     * Show help for a route.
     *
-     * @param   $route
+     * @param string $route
     *
     * @return JsonResponse
     */
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -30,54 +30,9 @@ use Illuminate\Http\Request;

 /**
 * Class AutoCompleteController.
- *
- * TODO autocomplete for transaction types.
- *
 */
 class AutoCompleteController extends Controller
 {
-    /**
-     * Searches in the titles of all transaction journals.
-     * The result is limited to the top 15 unique results.
-     *
-     * If the query is numeric, it will append the journal with that particular ID.
-     *
-     * @param Request $request
-     *
-     * @return JsonResponse
-     */
-    public function allJournalsWithID(Request $request): JsonResponse
-    {
-        $search = (string)$request->get('search');
-        /** @var JournalRepositoryInterface $repository */
-        $repository = app(JournalRepositoryInterface::class);

-        /** @var TransactionGroupRepositoryInterface $groupRepos */
-        $groupRepos = app(TransactionGroupRepositoryInterface::class);
-
-        $result = $repository->searchJournalDescriptions($search);
-        $array  = [];
-        if (is_numeric($search)) {
-            // search for group, not journal.
-            $firstResult = $groupRepos->find((int)$search);
-            if (null !== $firstResult) {
-                // group may contain multiple journals, each a result:
-                foreach ($firstResult->transactionJournals as $journal) {
-                    $array[] = $journal->toArray();
-                }
-            }
-        }
-        // if not numeric, search ahead!
-
-        // limit and unique
-        $limited = $result->slice(0, 15);
-        $array   = array_merge($array, $limited->toArray());
-        foreach ($array as $index => $item) {
-            // give another key for consistency
-            $array[$index]['name'] = sprintf('#%d: %s', $item['transaction_group_id'], $item['description']);
-        }
-
-        return response()->json($array);
-    }

 }
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -191,7 +191,7 @@ class PreferencesController extends Controller

        // same for locale:
        if (!auth()->user()->hasRole('demo')) {
-            /** @var Preference $currentLocale */
+            /** @var Preference $locale */
            $locale = $request->get('locale');
            app('preferences')->set('locale', $locale);
        }
--- a/app/Http/Controllers/Recurring/CreateController.php
+++ b/app/Http/Controllers/Recurring/CreateController.php
@@ -148,13 +148,13 @@ class CreateController extends Controller
            RecurrenceRepetition::WEEKEND_TO_MONDAY     => (string)trans('firefly.jump_to_monday'),
        ];

-        /** @var Transaction $source */
-        /** @var Transaction $dest */

        // fill prefilled with journal info
        $type = strtolower($journal->transactionType->type);

+        /** @var Transaction $source */
        $source      = $journal->transactions()->where('amount', '<', 0)->first();
+        /** @var Transaction $dest */
        $dest        = $journal->transactions()->where('amount', '>', 0)->first();
        $category    = $journal->categories()->first() ? $journal->categories()->first()->name : '';
        $budget      = $journal->budgets()->first() ? $journal->budgets()->first()->id : 0;
--- a/app/Http/Controllers/Report/TagController.php
+++ b/app/Http/Controllers/Report/TagController.php
@@ -122,7 +122,7 @@ class TagController extends Controller
        foreach ($earned as $currency) {
            $currencyId = $currency['currency_id'];

-            /** @var array $category */
+            /** @var array $tag */
            foreach ($currency['tags'] as $tag) {
                foreach ($tag['transaction_journals'] as $journal) {
                    $destinationId                                                                   = $journal['destination_account_id'];
--- a/app/Http/Controllers/Rule/IndexController.php
+++ b/app/Http/Controllers/Rule/IndexController.php
@@ -73,12 +73,10 @@ class IndexController extends Controller
     */
    public function index()
    {
-        /** @var User $user */
-        $user = auth()->user();
        $this->createDefaultRuleGroup();
        $this->createDefaultRule();
        $this->ruleGroupRepos->resetOrder();
-        $ruleGroups = $this->ruleGroupRepos->getRuleGroupsWithRules(null);
+        $ruleGroups = $this->ruleGroupRepos->getAllRuleGroupsWithRules(null);

        return prefixView('rules.index', compact('ruleGroups'));
    }
--- a/app/Http/Controllers/System/InstallController.php
+++ b/app/Http/Controllers/System/InstallController.php
@@ -105,6 +105,7 @@ class InstallController extends Controller
            'firefly-iii:fix-recurring-transactions'   => [],
            'firefly-iii:unify-group-accounts'         => [],
            'firefly-iii:fix-transaction-types'        => [],
+            'firefly-iii:fix-frontpage-accounts'       => [],

            // final command to set latest version in DB
            'firefly-iii:set-latest-version'           => ['--james-is-cool' => true],
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -100,7 +100,7 @@ class CreateController extends Controller
        $repository           = app(AccountRepositoryInterface::class);
        $cash                 = $repository->getCashAccount();
        $preFilled            = session()->has('preFilled') ? session('preFilled') : [];
-        $subTitle             = (string)trans('breadcrumbs.create_new_transaction');
+        $subTitle             = (string)trans(sprintf('breadcrumbs.create_%s', strtolower((string)$objectType)));
        $subTitleIcon         = 'fa-plus';
        $optionalFields       = app('preferences')->get('transaction_journal_optional_fields', [])->data;
        $allowedOpposingTypes = config('firefly.allowed_opposing_types');
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -34,7 +34,7 @@ use Illuminate\Http\Request;
 class TrustProxies extends Middleware
 {
    /** @var int The headers to check. */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    //protected $headers = Request::HEADER_X_FORWARDED_ALL;

    /**
     * TrustProxies constructor.
--- a/app/Http/Requests/BudgetFormStoreRequest.php
+++ b/app/Http/Requests/BudgetFormStoreRequest.php
@@ -65,7 +65,7 @@ class BudgetFormStoreRequest extends FormRequest
            'active'                  => 'numeric|between:0,1',
            'auto_budget_type'        => 'numeric|between:0,2',
            'auto_budget_currency_id' => 'exists:transaction_currencies,id',
-            'auto_budget_amount'      => 'min:0|max:1000000000',
+            'auto_budget_amount'      => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2',
            'auto_budget_period'      => 'in:daily,weekly,monthly,quarterly,half_year,yearly',
        ];
    }
--- a/app/Http/Requests/BudgetFormUpdateRequest.php
+++ b/app/Http/Requests/BudgetFormUpdateRequest.php
@@ -75,7 +75,7 @@ class BudgetFormUpdateRequest extends FormRequest
            'active'                  => 'numeric|between:0,1',
            'auto_budget_type'        => 'numeric|between:0,2',
            'auto_budget_currency_id' => 'exists:transaction_currencies,id',
-            'auto_budget_amount'      => 'min:0|max:1000000000',
+            'auto_budget_amount'      => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2',
            'auto_budget_period'      => 'in:daily,weekly,monthly,quarterly,half_year,yearly',
        ];
    }