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

Also replace variables in subject (#893)

Browse Source
This commit is contained in:
Bram
2022-04-25 14:32:21 +02:00
committed by GitHub
parent d7b1d15f93
commit 946c7efab4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Invoice.php
View File

@ -443,7 +443,8 @@ class Invoice extends Model implements HasMedia
$data['invoice'] = $this->toArray(); $data['invoice'] = $this->toArray();
$data['customer'] = $this->customer->toArray(); $data['customer'] = $this->customer->toArray();
$data['company'] = Company::find($this->company_id); $data['company'] = Company::find($this->company_id);
$data['body'] = $this->getEmailBody($data['body']); $data['subject'] = $this->getEmailString($data['subject']);
$data['body'] = $this->getEmailString($data['body']);
$data['attach']['data'] = ($this->getEmailAttachmentSetting()) ? $this->getPDFData() : null; $data['attach']['data'] = ($this->getEmailAttachmentSetting()) ? $this->getPDFData() : null;
return $data; return $data;
@ -635,7 +636,7 @@ class Invoice extends Model implements HasMedia
return $this->getFormattedString($this->notes); return $this->getFormattedString($this->notes);
} }
public function getEmailBody($body) public function getEmailString($body)
{ {
$values = array_merge($this->getFieldsArray(), $this->getExtraFields()); $values = array_merge($this->getFieldsArray(), $this->getExtraFields());