diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php index 4e87b63a174b..401060b6c7b4 100644 --- a/app/Services/Email/EmailDefaults.php +++ b/app/Services/Email/EmailDefaults.php @@ -333,16 +333,16 @@ class EmailDefaults } /* Company Documents */ - $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->company->documents->pluck('id')->toArray()); + $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->company->documents()->where('is_public', true)->pluck('id')->toArray()); /** Entity Documents */ if ($this->email->email_object->entity?->documents) { - $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->email_object->entity->documents->pluck('id')->toArray()); + $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->email_object->entity->documents()->where('is_public', true)->pluck('id')->toArray()); } /** Recurring Invoice Documents */ if ($this->email->email_object->entity instanceof Invoice && $this->email->email_object->entity->recurring_id != null) { - $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->email_object->entity->recurring_invoice->documents->pluck('id')->toArray()); + $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->email_object->entity->recurring_invoice->documents()->where('is_public', true)->pluck('id')->toArray()); } /** Task / Expense Documents */ diff --git a/lang/en/texts.php b/lang/en/texts.php index f957a2bfa232..8be95187c7be 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5156,8 +5156,8 @@ $LANG = array( 'show_document_preview' => 'Show Document Preview', 'cash_accounting' => 'Cash accounting', 'click_or_drop_files_here' => 'Click or drop files here', - 'set_as_public' => 'Set as public', - 'set_as_private' => 'Set as private', + 'set_public' => 'Set public', + 'set_private' => 'Set private', ); return $LANG;