diff --git a/app/Helpers/Bank/Nordigen/Nordigen.php b/app/Helpers/Bank/Nordigen/Nordigen.php index 68ca093a4e26..153303b37b1c 100644 --- a/app/Helpers/Bank/Nordigen/Nordigen.php +++ b/app/Helpers/Bank/Nordigen/Nordigen.php @@ -15,13 +15,13 @@ namespace App\Helpers\Bank\Nordigen; use App\Exceptions\NordigenApiException; use App\Helpers\Bank\Nordigen\Transformer\AccountTransformer; -use App\Helpers\Bank\Nordigen\Transformer\IncomeTransformer; +use App\Helpers\Bank\Nordigen\Transformer\TransactionTransformer; use Log; use Nordigen\NordigenPHP\Exceptions\NordigenExceptions\NordigenException; class Nordigen { - public bool $test_mode = config('ninja.nordigen.test_mode'); // https://developer.gocardless.com/bank-account-data/sandbox + public bool $test_mode; // https://developer.gocardless.com/bank-account-data/sandbox public string $sandbox_institutionId = "SANDBOXFINANCE_SFIN0000"; @@ -30,6 +30,8 @@ class Nordigen public function __construct(string $secret_id, string $secret_key) { + $this->test_mode = config('ninja.nordigen.test_mode'); + $this->client = new \Nordigen\NordigenPHP\API\NordigenClient($secret_id, $secret_key); $this->client->createAccessToken(); // access_token is valid 24h -> so we dont have to implement a refresh-cycle @@ -101,7 +103,7 @@ class Nordigen $transactionResponse = $this->client->account($accountId)->getAccountTransactions($dateFrom); - $it = new IncomeTransformer(); + $it = new TransactionTransformer(); return $it->transform($transactionResponse); } diff --git a/app/Helpers/Bank/Nordigen/Transformer/ExpenseTransformer.php b/app/Helpers/Bank/Nordigen/Transformer/ExpenseTransformer.php deleted file mode 100644 index ade514d8fdea..000000000000 --- a/app/Helpers/Bank/Nordigen/Transformer/ExpenseTransformer.php +++ /dev/null @@ -1,80 +0,0 @@ -bank_account_name = $nordigen_account['account_name']; $bank_integration->bank_account_status = $nordigen_account['account_status']; $bank_integration->bank_account_number = $nordigen_account['account_number']; - $bank_integration->nordigen_provider_id = $nordigen_account['provider_id']; + $bank_integration->nordigen_institution_id = $nordigen_account['provider_id']; $bank_integration->provider_name = $nordigen_account['provider_name']; $bank_integration->nickname = $nordigen_account['nickname']; $bank_integration->balance = $nordigen_account['current_balance']; diff --git a/app/Models/BankIntegration.php b/app/Models/BankIntegration.php index 446b8b25f2c0..5be2f2313b1d 100644 --- a/app/Models/BankIntegration.php +++ b/app/Models/BankIntegration.php @@ -32,7 +32,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property int|null $currency * @property string $nickname * @property string $nordigen_account_id - * @property string $nordigen_provider_id + * @property string $nordigen_institution_id * @property string|null $from_date * @property bool $is_deleted * @property int|null $created_at diff --git a/database/migrations/2023_11_26_082959_add_bank_integration_id.php b/database/migrations/2023_11_26_082959_add_bank_integration_id.php index 98ab0e7c815b..da6f778877da 100644 --- a/database/migrations/2023_11_26_082959_add_bank_integration_id.php +++ b/database/migrations/2023_11_26_082959_add_bank_integration_id.php @@ -17,7 +17,7 @@ return new class extends Migration { Schema::table('bank_integrations', function (Blueprint $table) { $table->string('integration_type')->nullable(); $table->string('nordigen_account_id')->nullable(); - $table->string('nordigen_provider_id')->nullable(); + $table->string('nordigen_institution_id')->nullable(); }); // migrate old account to be used with yodlee diff --git a/resources/views/bank/nordigen/connect.blade.php b/resources/views/bank/nordigen/connect.blade.php index a823726d99e2..716ee1837783 100644 --- a/resources/views/bank/nordigen/connect.blade.php +++ b/resources/views/bank/nordigen/connect.blade.php @@ -58,7 +58,7 @@ const institutionId = institution.getAttribute('data-institution'); const url = new URL(window.location.href); url.searchParams.set('institution_id', institutionId); - w.location.href = url.href; + window.location.href = url.href; }); });