Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 00:24:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

requested fixes

Browse Source
This commit is contained in:
paulwer 2024-02-27 07:36:32 +01:00
parent 33560bd6a6
commit 5d676cb6de
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Brevo/ProcessBrevoWebhook.php
View File

@ -421,7 +421,7 @@ class ProcessBrevoWebhook implements ShouldQueue
public function getRawMessage(string $message_id) public function getRawMessage(string $message_id)
{ {
$brevo_secret = $this->company->settings->brevo_secret ?? config('services.brevo.key'); $brevo_secret = isset($this->company->settings->brevo_secret) && trim($this->company->settings->brevo_secret) != '' ? $this->company->settings->brevo_secret : config('services.brevo.key');
$brevo = new TransactionalEmailsApi(null, Configuration::getDefaultConfiguration()->setApiKey('api-key', $brevo_secret)); $brevo = new TransactionalEmailsApi(null, Configuration::getDefaultConfiguration()->setApiKey('api-key', $brevo_secret));
$messageDetail = $brevo->getTransacEmailContent($message_id); $messageDetail = $brevo->getTransacEmailContent($message_id);

6
app/Jobs/PostMark/ProcessPostmarkWebhook.php
View File

@ -355,7 +355,9 @@ class ProcessPostmarkWebhook implements ShouldQueue
public function getRawMessage(string $message_id) public function getRawMessage(string $message_id)
{ {
$postmark = new PostmarkClient(config('services.postmark.token')); $postmark_secret = isset($this->company->settings->postmark_secret) && trim($this->company->settings->postmark_secret) != '' ? $this->company->settings->postmark_secret : config('services.postmark.token');
$postmark = new PostmarkClient($postmark_secret);
$messageDetail = $postmark->getOutboundMessageDetails($message_id); $messageDetail = $postmark->getOutboundMessageDetails($message_id);
return $messageDetail; return $messageDetail;
@ -386,7 +388,7 @@ class ProcessPostmarkWebhook implements ShouldQueue
try { try {
$postmark_secret = $this->company->settings->postmark_secret ?? config('services.postmark.token'); $postmark_secret = isset($this->company->settings->postmark_secret) && trim($this->company->settings->postmark_secret) != '' ? $this->company->settings->postmark_secret : config('services.postmark.token');
$postmark = new PostmarkClient($postmark_secret); $postmark = new PostmarkClient($postmark_secret);
$messageDetail = $postmark->getOutboundMessageDetails($this->request['MessageID']); $messageDetail = $postmark->getOutboundMessageDetails($this->request['MessageID']);