From 32d7a0fd1be2434fe3716bf4e7aeaf7015ae964f Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 17 Dec 2021 17:27:01 +0100 Subject: [PATCH] Fix some code quality things. --- app/Helpers/Attachments/AttachmentHelper.php | 4 ++- .../Transaction/CreateController.php | 7 ++-- app/Http/Middleware/StartFireflySession.php | 2 +- .../Account/AccountRepository.php | 8 ++--- frontend/src/components/accounts/Show.vue | 29 ++-------------- frontend/src/components/bills/Create.vue | 3 -- .../components/dashboard/MainBudgetList.vue | 2 +- .../src/components/transactions/Index.vue | 34 +------------------ .../transactions/TransactionListLarge.vue | 4 +-- 9 files changed, 14 insertions(+), 79 deletions(-) diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index b988220f21..eb8b861b8a 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -176,7 +176,9 @@ class AttachmentHelper implements AttachmentHelperInterface return false; } // is allowed? Save the file, without encryption. - $this->uploadDisk->put($attachment->fileName(), $content); + $parts = explode('/', $attachment->fileName()); + $file = $parts[count($parts) - 1]; + $this->uploadDisk->put($file, $content); // update attachment. $attachment->md5 = md5_file($path); diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php index 85d2997adf..63f5af9352 100644 --- a/app/Http/Controllers/Transaction/CreateController.php +++ b/app/Http/Controllers/Transaction/CreateController.php @@ -26,7 +26,6 @@ namespace FireflyIII\Http\Controllers\Transaction; use FireflyIII\Events\StoredTransactionGroup; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Models\TransactionGroup; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use FireflyIII\Services\Internal\Update\GroupCloneService; @@ -109,9 +108,9 @@ class CreateController extends Controller $sourceId = (int)request()->get('source'); $destinationId = (int)request()->get('destination'); - /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class); - $cash = $repository->getCashAccount(); + /** @var AccountRepositoryInterface $accountRepository */ + $accountRepository = app(AccountRepositoryInterface::class); + $cash = $accountRepository->getCashAccount(); $preFilled = session()->has('preFilled') ? session('preFilled') : []; $subTitle = (string)trans(sprintf('breadcrumbs.create_%s', strtolower((string)$objectType))); $subTitleIcon = 'fa-plus'; diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index 2f333ef4ac..4b0932f891 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -54,7 +54,7 @@ class StartFireflySession extends StartSession //Log::debug(sprintf('storeCurrentUrl: Redirect is now "%s".', $safeUrl)); $session->setPreviousUrl($safeUrl); - return; + // return; } //Log::debug(sprintf('storeCurrentUrl: Refuse to set "%s" as current URL.', $safeUrl)); } diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index a1e0fd81da..72a0701f5f 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -494,10 +494,8 @@ class AccountRepository implements AccountRepositoryInterface public function getOpeningBalanceGroup(Account $account): ?TransactionGroup { $journal = $this->getOpeningBalance($account); - $group = null; - $group = $journal?->transactionGroup; - return $group; + return $journal?->transactionGroup; } /** @@ -637,11 +635,9 @@ class AccountRepository implements AccountRepositoryInterface */ public function oldestJournalDate(Account $account): ?Carbon { - $result = null; $journal = $this->oldestJournal($account); - $result = $journal?->date; - return $result; + return $journal?->date; } /** diff --git a/frontend/src/components/accounts/Show.vue b/frontend/src/components/accounts/Show.vue index bb40688054..d7ff2eb0dc 100644 --- a/frontend/src/components/accounts/Show.vue +++ b/frontend/src/components/accounts/Show.vue @@ -22,32 +22,7 @@
- - +
@@ -162,7 +137,7 @@ export default { .then(response => { // console.log('Now getTransactions() DONE!'); this.total = parseInt(response.data.meta.pagination.total); - let transactions = response.data.data; + // let transactions = response.data.data; // console.log('Have downloaded ' + transactions.length + ' transactions'); // console.log(response.data); this.rawTransactions = response.data.data; diff --git a/frontend/src/components/bills/Create.vue b/frontend/src/components/bills/Create.vue index 269c8d2e5f..17a674f89e 100644 --- a/frontend/src/components/bills/Create.vue +++ b/frontend/src/components/bills/Create.vue @@ -332,6 +332,3 @@ export default { } - \ No newline at end of file diff --git a/frontend/src/components/dashboard/MainBudgetList.vue b/frontend/src/components/dashboard/MainBudgetList.vue index 1e7643659d..5c19c2c6be 100644 --- a/frontend/src/components/dashboard/MainBudgetList.vue +++ b/frontend/src/components/dashboard/MainBudgetList.vue @@ -219,7 +219,7 @@ export default { // remove budget info from rawBudgets if it's there: this.filterBudgets(budgetId, currencyId); - let name = this.budgets[current.attributes.budget_id].name; + // let name = this.budgets[current.attributes.budget_id].name; // spent within budget: if (0.0 !== spentFloat && spentFloatPos < amount) { // console.log('Spent ' + name + ' in budget'); diff --git a/frontend/src/components/transactions/Index.vue b/frontend/src/components/transactions/Index.vue index 45d13672d2..89b229ceb9 100644 --- a/frontend/src/components/transactions/Index.vue +++ b/frontend/src/components/transactions/Index.vue @@ -20,24 +20,7 @@ diff --git a/frontend/src/components/transactions/TransactionListLarge.vue b/frontend/src/components/transactions/TransactionListLarge.vue index 081ebbd8c8..3b9ea4042e 100644 --- a/frontend/src/components/transactions/TransactionListLarge.vue +++ b/frontend/src/components/transactions/TransactionListLarge.vue @@ -169,10 +169,8 @@
(button) -