Merge pull request coollabsio#3846 from ershisan99/next

fix: use correct env variable for invoice ninja password
winning1120xx · Oct 11, 2024 · 35834ea · 35834ea
2 parents 62eeafe + 9e5551c
commit 35834ea
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/Models/Service.php b/app/Models/Service.php
@@ -384,15 +384,15 @@ public function extraFields()
                     $email = $this->environment_variables()->where('key', 'IN_USER_EMAIL')->first();
                     $data = $data->merge([
                         'Email' => [
-                            'key' => 'IN_USER_EMAIL',
+                            'key' => data_get($email, 'key'),
                             'value' => data_get($email, 'value'),
                             'rules' => 'required|email',
                         ],
                     ]);
                     $password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_INVOICENINJAUSER')->first();
                     $data = $data->merge([
                         'Password' => [
-                            'key' => 'IN_PASSWORD',
+                            'key' => data_get($password, 'key'),
                             'value' => data_get($password, 'value'),
                             'rules' => 'required',
                             'isPassword' => true,