-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(deps): lock file maintenance (#18)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Diogo Correia <me@diogotc.com>
- Loading branch information
1 parent
078d648
commit d488ab4
Showing
5 changed files
with
82 additions
and
82 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 21 additions & 18 deletions
39
overlays/firefly-iii-data-importer/0001-no-transactions-warning-instead-of-error.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,43 @@ | ||
| diff --git a/app/Console/AutoImports.php b/app/Console/AutoImports.php | ||
| index c45b296..33b8f00 100644 | ||
| index 1ab510d..8e9438a 100644 | ||
| --- a/app/Console/AutoImports.php | ||
| +++ b/app/Console/AutoImports.php | ||
| @@ -283,9 +283,6 @@ trait AutoImports | ||
| if (count($this->importErrors) > 0) { | ||
| return 1; | ||
| @@ -304,11 +304,6 @@ trait AutoImports | ||
|
|
||
| return ExitCode::GENERAL_ERROR->value; | ||
| } | ||
| - if (0 === count($messages) && 0 === count($warnings) && 0 === count($errors)) { | ||
| - return 73; | ||
| - app('log')->error(sprintf('Exit code is %s.', ExitCode::NOTHING_WAS_IMPORTED->name)); | ||
| - | ||
| - return ExitCode::NOTHING_WAS_IMPORTED->value; | ||
| - } | ||
|
|
||
| return 0; | ||
| } | ||
| app('log')->error(sprintf('Exit code is %s.', ExitCode::SUCCESS->name)); | ||
|
|
||
| diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php | ||
| index bc5831b..dff21aa 100644 | ||
| index b7eddbd..854cf54 100644 | ||
| --- a/app/Console/Commands/Import.php | ||
| +++ b/app/Console/Commands/Import.php | ||
| @@ -157,9 +157,6 @@ final class Import extends Command | ||
| if (0 !== count($this->importErrors)) { | ||
| $exitCode = 1; | ||
| @@ -175,10 +175,6 @@ final class Import extends Command | ||
| $exitCode = ExitCode::GENERAL_ERROR->value; | ||
| app('log')->error(sprintf('Exit code is %s.', ExitCode::GENERAL_ERROR->name)); | ||
| } | ||
| - if (0 === count($messages) && 0 === count($warnings) && 0 === count($errors)) { | ||
| - $exitCode = 73; | ||
| - $exitCode = ExitCode::NOTHING_WAS_IMPORTED->value; | ||
| - app('log')->error(sprintf('Exit code is %s.', ExitCode::NOTHING_WAS_IMPORTED->name)); | ||
| - } | ||
|
|
||
| return $exitCode; | ||
| } | ||
| if ($exitCode === ExitCode::SUCCESS->value) { | ||
| app('log')->debug(sprintf('Exit code is %s.', ExitCode::SUCCESS->name)); | ||
| } | ||
| diff --git a/app/Services/Nordigen/Conversion/RoutineManager.php b/app/Services/Nordigen/Conversion/RoutineManager.php | ||
| index 047df30..d259cf7 100644 | ||
| index 4f8069f..d252b5d 100644 | ||
| --- a/app/Services/Nordigen/Conversion/RoutineManager.php | ||
| +++ b/app/Services/Nordigen/Conversion/RoutineManager.php | ||
| @@ -329,7 +329,6 @@ class RoutineManager implements RoutineManagerInterface | ||
| @@ -328,7 +328,6 @@ class RoutineManager implements RoutineManagerInterface | ||
| if (0 === $total) { | ||
| app('log')->warning('Downloaded nothing, will return nothing.'); | ||
| // add error to current error thing: | ||
| - $this->addError(0, 'No transactions were downloaded from GoCardless. You may be rate limited or something else went wrong.'); | ||
| - $this->addError(0, '[a111]: No transactions were downloaded from GoCardless. You may be rate limited or something else went wrong.'); | ||
| $this->mergeMessages(1); | ||
| $this->mergeWarnings(1); | ||
| $this->mergeErrors(1); |
80 changes: 40 additions & 40 deletions
80
overlays/firefly-iii-data-importer/0002-send-file-name-in-email.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
overlays/firefly-iii/0001-allow-seconds-in-transaction-date.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| diff --git a/resources/assets/v1/src/components/transactions/EditTransaction.vue b/resources/assets/v1/src/components/transactions/EditTransaction.vue | ||
| index ed39dc47f0..edc6670930 100644 | ||
| index 97fbf78f41..20232584f6 100644 | ||
| --- a/resources/assets/v1/src/components/transactions/EditTransaction.vue | ||
| +++ b/resources/assets/v1/src/components/transactions/EditTransaction.vue | ||
| @@ -454,7 +454,7 @@ export default { | ||
| @@ -470,7 +470,7 @@ export default { | ||
| let result = { | ||
| transaction_journal_id: transaction.transaction_journal_id, | ||
| description: transaction.description, | ||
| - date: transaction.date.substring(0, 16), | ||
| + date: transaction.date.substring(0, 19), | ||
| reconciled: transaction.reconciled, | ||
| amount: this.roundNumber(this.positiveAmount(transaction.amount), transaction.currency_decimal_places), | ||
| category: transaction.category_name, | ||
| errors: { |