Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for notifications (#3561)

Browse Source
This commit is contained in:
David Bomba 2020-03-29 23:47:41 +11:00 committed by GitHub
parent 8b0fe63eb5
commit 9d6da3e37b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/EmailController.php
View File

@ -115,8 +115,9 @@ class EmailController extends BaseController
}); });
$data = []; $entity->service()->markSent()->save();
return $this->itemResponse($entity);
return response()->json($data, 200);
} }
} }

8
app/Notifications/SendGenericNotification.php
View File

@ -58,8 +58,8 @@ class SendGenericNotification extends Notification implements ShouldQueue
* @return array * @return array
*/ */
public function via($notifiable) public function via($notifiable)
{\Log::error("via"); {
return ['slack','mail']; return ['mail'];
} }
/** /**
@ -70,7 +70,7 @@ class SendGenericNotification extends Notification implements ShouldQueue
*/ */
public function toMail($notifiable) public function toMail($notifiable)
{ {
\Log::error("to mail");
$subject = $this->generateEmailEntityHtml($this->entity, $this->subject, $this->contact); $subject = $this->generateEmailEntityHtml($this->entity, $this->subject, $this->contact);
$body = $this->generateEmailEntityHtml($this->entity, $this->body, $this->contact); $body = $this->generateEmailEntityHtml($this->entity, $this->body, $this->contact);
@ -114,7 +114,7 @@ class SendGenericNotification extends Notification implements ShouldQueue
public function toSlack($notifiable) public function toSlack($notifiable)
{ {
\Log::error("slack");
return ''; return '';
// $logo = $this->company->present()->logo(); // $logo = $this->company->present()->logo();
// $amount = Number::formatMoney($this->invoice->amount, $this->invoice->client); // $amount = Number::formatMoney($this->invoice->amount, $this->invoice->client);