Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

update deps, fixes & stop processing archived bank_integrations

Browse Source
This commit is contained in:
paulwer 2023-12-18 15:48:25 +01:00
parent 4f6e0f53f7
commit e4d0c9f901
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Bank/NordigenController.php
View File

@ -296,7 +296,7 @@ class NordigenController extends BaseController
$existing_bank_integration->bank_account_status = $account['account_status']; $existing_bank_integration->bank_account_status = $account['account_status'];
$existing_bank_integration->disabled_upstream = false; $existing_bank_integration->disabled_upstream = false;
$existing_bank_integration->auto_sync = true; $existing_bank_integration->auto_sync = true;
$bank_integration->from_date = now()->subDays(90); // default max-fetch interval of nordigen is 90 days $existing_bank_integration->from_date = now()->subDays(90); // default max-fetch interval of nordigen is 90 days
$existing_bank_integration->save(); $existing_bank_integration->save();
@ -306,7 +306,7 @@ class NordigenController extends BaseController
} }
// perform update in background // perform update in background
$company->account->bank_integrations->where("integration_type", BankIntegration::INTEGRATION_TYPE_NORDIGEN)->where('auto_sync', true)->each(function ($bank_integration) { $company->account->bank_integrations->where("integration_type", BankIntegration::INTEGRATION_TYPE_NORDIGEN)->where('auto_sync', true)->where('is_deleted', false)->each(function ($bank_integration) {
ProcessBankTransactionsNordigen::dispatch($bank_integration); ProcessBankTransactionsNordigen::dispatch($bank_integration);

2
app/Http/Controllers/Bank/YodleeController.php
View File

@ -98,7 +98,7 @@ class YodleeController extends BaseController
} }
$company->account->bank_integrations->each(function ($bank_integration) use ($company) { // TODO: filter to yodlee only $company->account->bank_integrations->where("integration_type", BankIntegration::INTEGRATION_TYPE_YODLEE)->where('auto_sync', true)->where('is_deleted', false)->each(function ($bank_integration) use ($company) { // TODO: filter to yodlee only
ProcessBankTransactionsYodlee::dispatch($company->account, $bank_integration); ProcessBankTransactionsYodlee::dispatch($company->account, $bank_integration);

4
app/Http/Controllers/BankIntegrationController.php
View File

@ -340,13 +340,13 @@ class BankIntegrationController extends BaseController
$account = auth()->user()->account(); $account = auth()->user()->account();
if (Ninja::isHosted() && $account->isPaid() && $account->plan == 'enterprise') { if (Ninja::isHosted() && $account->isPaid() && $account->plan == 'enterprise') {
$account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_YODLEE)->where('auto_sync', true)->cursor()->each(function ($bank_integration) use ($account) { $account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_YODLEE)->where('auto_sync', true)->where('is_deleted', false)->cursor()->each(function ($bank_integration) use ($account) {
(new ProcessBankTransactionsYodlee($account, $bank_integration))->handle(); (new ProcessBankTransactionsYodlee($account, $bank_integration))->handle();
}); });
} }
if (config("ninja.nordigen.secret_id") && config("ninja.nordigen.secret_key") && (Ninja::isSelfHost() || (Ninja::isHosted() && $account->isPaid() && $account->plan == 'enterprise'))) { if (config("ninja.nordigen.secret_id") && config("ninja.nordigen.secret_key") && (Ninja::isSelfHost() || (Ninja::isHosted() && $account->isPaid() && $account->plan == 'enterprise'))) {
$account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_NORDIGEN)->where('auto_sync', true)->cursor()->each(function ($bank_integration) { $account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_NORDIGEN)->where('auto_sync', true)->where('is_deleted', false)->cursor()->each(function ($bank_integration) {
Log::info($bank_integration); Log::info($bank_integration);
(new ProcessBankTransactionsNordigen($bank_integration))->handle(); (new ProcessBankTransactionsNordigen($bank_integration))->handle();

4
app/Jobs/Ninja/BankTransactionSync.php
View File

@ -55,7 +55,7 @@ class BankTransactionSync implements ShouldQueue
Account::with('bank_integrations')->whereNotNull('bank_integration_account_id')->cursor()->each(function ($account) { Account::with('bank_integrations')->whereNotNull('bank_integration_account_id')->cursor()->each(function ($account) {
if ($account->isPaid() && $account->plan == 'enterprise') { if ($account->isPaid() && $account->plan == 'enterprise') {
$account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_YODLEE)->where('auto_sync', true)->cursor()->each(function ($bank_integration) use ($account) { $account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_YODLEE)->where('auto_sync', true)->where('is_deleted', false)->cursor()->each(function ($bank_integration) use ($account) {
(new ProcessBankTransactionsYodlee($account, $bank_integration))->handle(); (new ProcessBankTransactionsYodlee($account, $bank_integration))->handle();
}); });
} }
@ -69,7 +69,7 @@ class BankTransactionSync implements ShouldQueue
Account::with('bank_integrations')->cursor()->each(function ($account) { Account::with('bank_integrations')->cursor()->each(function ($account) {
if ((Ninja::isSelfHost() || (Ninja::isHosted() && $account->isPaid() && $account->plan == 'enterprise'))) { if ((Ninja::isSelfHost() || (Ninja::isHosted() && $account->isPaid() && $account->plan == 'enterprise'))) {
$account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_NORDIGEN)->where('auto_sync', true)->cursor()->each(function ($bank_integration) { $account->bank_integrations()->where('integration_type', BankIntegration::INTEGRATION_TYPE_NORDIGEN)->where('auto_sync', true)->where('is_deleted', false)->cursor()->each(function ($bank_integration) {
(new ProcessBankTransactionsNordigen($bank_integration))->handle(); (new ProcessBankTransactionsNordigen($bank_integration))->handle();
}); });
} }

36
composer.lock generated
View File

@ -972,16 +972,16 @@
}, },
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
"version": "1.3.7", "version": "1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/ca-bundle.git", "url": "https://github.com/composer/ca-bundle.git",
"reference": "76e46335014860eec1aa5a724799a00a2e47cc85" "reference": "b66d11b7479109ab547f9405b97205640b17d385"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/76e46335014860eec1aa5a724799a00a2e47cc85", "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b66d11b7479109ab547f9405b97205640b17d385",
"reference": "76e46335014860eec1aa5a724799a00a2e47cc85", "reference": "b66d11b7479109ab547f9405b97205640b17d385",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -993,7 +993,7 @@
"phpstan/phpstan": "^0.12.55", "phpstan/phpstan": "^0.12.55",
"psr/log": "^1.0", "psr/log": "^1.0",
"symfony/phpunit-bridge": "^4.2 || ^5", "symfony/phpunit-bridge": "^4.2 || ^5",
"symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -1020,7 +1020,7 @@
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues", "issues": "https://github.com/composer/ca-bundle/issues",
"source": "https://github.com/composer/ca-bundle/tree/1.3.7" "source": "https://github.com/composer/ca-bundle/tree/1.4.0"
}, },
"funding": [ "funding": [
{ {
@ -1036,7 +1036,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-08-30T09:31:38+00:00" "time": "2023-12-18T12:05:55+00:00"
}, },
{ {
"name": "dasprid/enum", "name": "dasprid/enum",
@ -2416,16 +2416,16 @@
}, },
{ {
"name": "google/apiclient-services", "name": "google/apiclient-services",
"version": "v0.327.0", "version": "v0.328.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git", "url": "https://github.com/googleapis/google-api-php-client-services.git",
"reference": "51a11d4ff70dd9f60334525e71bf4cf592e6d282" "reference": "211ba786d30a4ab21e012d2b7dbefc49b4fc6a3d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/51a11d4ff70dd9f60334525e71bf4cf592e6d282", "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/211ba786d30a4ab21e012d2b7dbefc49b4fc6a3d",
"reference": "51a11d4ff70dd9f60334525e71bf4cf592e6d282", "reference": "211ba786d30a4ab21e012d2b7dbefc49b4fc6a3d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2448,9 +2448,9 @@
"keywords": ["google"], "keywords": ["google"],
"support": { "support": {
"issues": "https://github.com/googleapis/google-api-php-client-services/issues", "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.327.0" "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.328.0"
}, },
"time": "2023-12-11T00:52:16+00:00" "time": "2023-12-18T01:00:18+00:00"
}, },
{ {
"name": "google/auth", "name": "google/auth",
@ -8795,16 +8795,16 @@
}, },
{ {
"name": "razorpay/razorpay", "name": "razorpay/razorpay",
"version": "2.8.7", "version": "2.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/razorpay/razorpay-php.git", "url": "https://github.com/razorpay/razorpay-php.git",
"reference": "2180c8c3c39678623f5cb8f639c39a706de14c44" "reference": "a3d7c2bcb416091edd6a76eb5a7600eaf00ac837"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/razorpay/razorpay-php/zipball/2180c8c3c39678623f5cb8f639c39a706de14c44", "url": "https://api.github.com/repos/razorpay/razorpay-php/zipball/a3d7c2bcb416091edd6a76eb5a7600eaf00ac837",
"reference": "2180c8c3c39678623f5cb8f639c39a706de14c44", "reference": "a3d7c2bcb416091edd6a76eb5a7600eaf00ac837",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8847,7 +8847,7 @@
"issues": "https://github.com/Razorpay/razorpay-php/issues", "issues": "https://github.com/Razorpay/razorpay-php/issues",
"source": "https://github.com/Razorpay/razorpay-php" "source": "https://github.com/Razorpay/razorpay-php"
}, },
"time": "2023-09-11T08:31:26+00:00" "time": "2023-12-18T04:19:46+00:00"
}, },
{ {
"name": "rmccue/requests", "name": "rmccue/requests",