Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 11:04:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for emails

Browse Source
This commit is contained in:
David Bomba 2023-03-08 17:56:34 +11:00
parent 3ef2591b38
commit 9874c1aee5
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/CSV/DocumentExport.php
View File

@ -25,7 +25,7 @@ class DocumentExport extends BaseExport
private $entity_transformer; private $entity_transformer;
public $date_key = 'created_at'; public string $date_key = 'created_at';
public array $entity_keys = [ public array $entity_keys = [
'record_type' => 'record_type', 'record_type' => 'record_type',

2
app/Export/CSV/ExpenseExport.php
View File

@ -25,7 +25,7 @@ class ExpenseExport extends BaseExport
private $expense_transformer; private $expense_transformer;
public $date_key = 'date'; public string $date_key = 'date';
public array $entity_keys = [ public array $entity_keys = [
'amount' => 'amount', 'amount' => 'amount',

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

@ -190,6 +190,12 @@ class EmailController extends BaseController
$this->entity_transformer = RecurringInvoiceTransformer::class; $this->entity_transformer = RecurringInvoiceTransformer::class;
} }
if($entity_obj instanceof PurchaseOrder){
$this->entity_type = PurchaseOrder::class;
$this->entity_transformer = PurchaseOrderTransformer::class;
}
// @phpstan-ignore-next-line
return $this->itemResponse($entity_obj->fresh()); return $this->itemResponse($entity_obj->fresh());
} }

2
app/Http/Requests/Email/SendEmailRequest.php
View File

@ -83,7 +83,7 @@ class SendEmailRequest extends Request
$input = $this->all(); $input = $this->all();
if (Ninja::isHosted() && !auth()->user()->company()->account->account_sms_verified) { if (Ninja::isHosted() && !auth()->user()->account->account_sms_verified) {
$this->error_message = ctrans('texts.authorization_sms_failure'); $this->error_message = ctrans('texts.authorization_sms_failure');
return false; return false;

9
app/Services/Email/EmailDefaults.php
View File

@ -259,15 +259,14 @@ class EmailDefaults
*/ */
private function setAttachments(): self private function setAttachments(): self
{ {
$attachments = []; $documents = [];
if ($this->email->email_object->settings->document_email_attachment && $this->email->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) { if ($this->email->email_object->settings->document_email_attachment && $this->email->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) {
foreach ($this->email->company->documents as $document) {
$attachments[] = ['file' => base64_encode($document->getFile()), 'name' => $document->name]; $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->company->documents->pluck('id')->toArray());
}
} }
$this->email->email_object->attachments = array_merge($this->email->email_object->attachments, $attachments);
return $this; return $this;
} }