mirror of
				https://github.com/crater-invoice/crater.git
				synced 2025-10-31 05:31:10 -04:00 
			
		
		
		
	Merge branch 'master' of https://github.com/bytefury/crater
This commit is contained in:
		| @ -461,7 +461,8 @@ class Invoice extends Model implements HasMedia | ||||
|         $data['invoice'] = $this->toArray(); | ||||
|         $data['customer'] = $this->customer->toArray(); | ||||
|         $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; | ||||
|  | ||||
|         return $data; | ||||
| @ -653,7 +654,7 @@ class Invoice extends Model implements HasMedia | ||||
|         return $this->getFormattedString($this->notes); | ||||
|     } | ||||
|  | ||||
|     public function getEmailBody($body) | ||||
|     public function getEmailString($body) | ||||
|     { | ||||
|         $values = array_merge($this->getFieldsArray(), $this->getExtraFields()); | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user