Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated translations

This commit is contained in:
David Bomba 2025-08-31 17:21:43 +10:00
parent c37318c2cc
commit 1333942a84
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -394,6 +394,14 @@ class NinjaMailerJob implements ShouldQueue
$this->mailer = 'mailgun';
$this->setHostedMailgunMailer();
return $this;
case 'ses':
$this->mailer = 'ses';
$this->setHostedSesMailer();
return $this;
// case 'client_ses':
// $this->mailer = 'ses';
// $this->setSesMailer();
// return $this;
case 'gmail':
$this->mailer = 'gmail';
$this->setGmailMailer();
@ -430,6 +438,22 @@ class NinjaMailerJob implements ShouldQueue
return $this;
}
private function setHostedSesMailer()
{
if (property_exists($this->nmo->settings, 'email_from_name') && strlen($this->nmo->settings->email_from_name) > 1) {
$email_from_name = $this->nmo->settings->email_from_name;
} else {
$email_from_name = $this->company->present()->name();
}
$this->nmo
->mailable
->from(config('services.ses.from.address'), $email_from_name);
}
private function configureSmtpMailer()
{

18
app/Services/Email/Email.php
View File

@ -532,6 +532,20 @@ class Email implements ShouldQueue
return false;
}
private function setHostedSesMailer()
{
if (property_exists($this->email_object->settings, 'email_from_name') && strlen($this->email_object->settings->email_from_name) > 1) {
$email_from_name = $this->email_object->settings->email_from_name;
} else {
$email_from_name = $this->company->present()->name();
}
$this->mailable
->from(config('services.ses.from.address'), $email_from_name);
}
private function setHostedMailgunMailer()
{
@ -601,6 +615,10 @@ class Email implements ShouldQueue
$this->mailer = 'mailgun';
$this->setHostedMailgunMailer();
return $this;
case 'ses':
$this->mailer = 'ses';
$this->setHostedSesMailer();
return $this;
case 'gmail':
$this->mailer = 'gmail';
$this->setGmailMailer();

4
lang/en/texts.php
View File

@ -5622,6 +5622,10 @@ $lang = array(
'activity_151' => 'Client :notes merged into :client by :user',
'activity_152' => 'Vendor :notes merged into :vendor by :user',
'activity_153' => 'Client :notes purged by :user',
'lifecycle' => 'Lifecycle',
'order_columns' => 'Order Columns',
'topic_arn' => 'Topic ARN',
);
return $lang;