TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-30 21:21:09 -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

7
app/Mail/SendPaymentMail.php
View File

@ -43,6 +43,7 @@ class SendPaymentMail extends Mailable
'mailable_id' => $this->data['payment']['id']
]);
<<<<<<< HEAD
$mailContent = $this->from($this->data['from'])
->subject($this->data['subject'])
->markdown('emails.send.payment', ['data', $this->data]);
@ -55,5 +56,11 @@ class SendPaymentMail extends Mailable
}
return $mailContent;
=======
return $this->from($this->data['from'], config('mail.from.name'))
->subject($this->data['subject'])
->markdown('emails.send.payment', ['data', $this->data]);
>>>>>>> master
}
}