TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
Sebastian Cretu
2021-03-02 21:19:16 +01:00
parent cfc0a1ef75 02a2db4417
commit 1932c5a75e
8 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Mail/SendEstimateMail.php
View File

@ -42,9 +42,15 @@ class SendEstimateMail extends Mailable
'mailable_id' => $this->data['estimate']['id']
]);
<<<<<<< HEAD
$mailContent = $this->from($this->data['from'])
->subject($this->data['subject'])
->markdown('emails.send.estimate', ['data', $this->data]);
=======
return $this->from($this->data['from'], config('mail.from.name'))
->subject($this->data['subject'])
->markdown('emails.send.estimate', ['data', $this->data]);
>>>>>>> master
if ($this->pdfData) {
$mailContent->attachData(