diff --git a/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php b/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php index 9b47211e..a0de314b 100755 --- a/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php +++ b/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php @@ -58,6 +58,7 @@ class MailConfigurationController extends Controller 'mail_mailgun_secret' => config('services.mailgun.secret'), 'mail_ses_key' => config('services.ses.key'), 'mail_ses_secret' => config('services.ses.secret'), + 'mail_ses_region' => config('services.ses.region'), ]; return response()->json($MailData); diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php index 24e5c905..f0b3c3d0 100755 --- a/app/Space/EnvironmentManager.php +++ b/app/Space/EnvironmentManager.php @@ -296,6 +296,7 @@ class EnvironmentManager 'MAIL_FROM_NAME' => $request->get('from_name'), 'SES_KEY' => $request->get('mail_ses_key'), 'SES_SECRET' => $request->get('mail_ses_secret'), + 'SES_REGION' => $request->get('mail_ses_region'), ]; break; diff --git a/config/services.php b/config/services.php index 3fa966dd..9b00f7bf 100644 --- a/config/services.php +++ b/config/services.php @@ -48,4 +48,10 @@ return [ 'auth_token' => env('CRON_JOB_AUTH_TOKEN', 0), ], + 'ses' => [ + 'key' => env('SES_KEY'), + 'secret' => env('SES_SECRET'), + 'region' => env('SES_REGION', 'us-east-1'), + ], + ]; diff --git a/lang/en.json b/lang/en.json index 0d4caaa0..37b90e16 100644 --- a/lang/en.json +++ b/lang/en.json @@ -893,6 +893,7 @@ "mailgun_endpoint": "Mailgun Endpoint", "ses_secret": "SES Secret", "ses_key": "SES Key", + "ses_region": "AWS Region", "password": "Mail Password", "username": "Mail Username", "mail_config": "Mail Configuration", @@ -1281,7 +1282,7 @@ "title": "Update App", "description": "You can easily update InvoiceShelf by checking for a new update by clicking the button below", "check_update": "Check for updates", - "insider_consent" : "Opt-in for Insider releases. Recommended for testing purposes only.", + "insider_consent": "Opt-in for Insider releases. Recommended for testing purposes only.", "avail_update": "New Update available", "next_version": "Next version", "requirements": "Requirements", @@ -1469,9 +1470,9 @@ "failed": "Domain verification failed. Please enter valid domain name.", "verify_and_continue": "Verify And Continue", "notes": { - "notes" : "Notes:", - "not_contain" : "App domain should not contain", - "or" : "or", + "notes": "Notes:", + "not_contain": "App domain should not contain", + "or": "or", "in_front": "in front of the domain.", "if_you": "If you're accessing the website on a different port, please mention the port. For example:" } diff --git a/lang/es.json b/lang/es.json index af7cb02e..889e2721 100644 --- a/lang/es.json +++ b/lang/es.json @@ -893,6 +893,7 @@ "mailgun_endpoint": "Mailgun endpoint", "ses_secret": "Secreto SES", "ses_key": "Clave SES", + "ses_region": "Región de AWS", "password": "Contraseña de correo", "username": "Nombre de usuario de correo", "mail_config": "Configuración de correo", diff --git a/lang/pt-br.json b/lang/pt-br.json index 4a394d62..0017b656 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -571,6 +571,7 @@ "mailgun_endpoint": "Mailgun Endpoint", "ses_secret": "SES Segredo", "ses_key": "SES Chave", + "ses_region": "Região AWS", "password": "Senha do Email", "username": "Nome de Usuário do Email", "mail_config": "Configuração de Email", diff --git a/lang/pt.json b/lang/pt.json index a9704734..298742c5 100644 --- a/lang/pt.json +++ b/lang/pt.json @@ -1484,6 +1484,7 @@ "mailgun_endpoint": "Endpoint do Mailgun", "ses_secret": "Senha do SES", "ses_key": "Chave SES", + "ses_region": "Região AWS", "password": "Senha do email", "username": "Nome do Usuário do email", "mail_config": "Configuração de email", diff --git a/lang/uk.json b/lang/uk.json index 018d6602..91efa6f3 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -893,6 +893,7 @@ "mailgun_endpoint": "Mailgun Endpoint", "ses_secret": "SES Secret", "ses_key": "SES Key", + "ses_region": "AWS Region", "password": "Mail Password", "username": "Mail Username", "mail_config": "Mail Configuration", diff --git a/resources/scripts/admin/stores/mail-driver.js b/resources/scripts/admin/stores/mail-driver.js index f6086efd..41a0971a 100644 --- a/resources/scripts/admin/stores/mail-driver.js +++ b/resources/scripts/admin/stores/mail-driver.js @@ -37,6 +37,7 @@ export const useMailDriverStore = (useWindow = false) => { mail_port: null, mail_ses_key: '', mail_ses_secret: '', + mail_ses_region: '', mail_encryption: 'tls', from_mail: '', from_name: '', diff --git a/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue index 6e754434..a2ff3af3 100644 --- a/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue +++ b/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue @@ -167,6 +167,25 @@ + + + + { mail_ses_secret: { required: helpers.withMessage(t('validation.required'), required), }, + mail_ses_region: { + required: helpers.withMessage(t('validation.required'), required), + }, mail_encryption: { required: helpers.withMessage(t('validation.required'), required), }, diff --git a/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue index 51b54d83..098d5e3a 100644 --- a/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue +++ b/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue @@ -161,6 +161,26 @@ + + + + +
@@ -238,6 +258,9 @@ const rules = computed(() => { mail_ses_secret: { required: helpers.withMessage(t('validation.required'), required), }, + mail_ses_region: { + required: helpers.withMessage(t('validation.required'), required), + }, mail_encryption: { required: helpers.withMessage(t('validation.required'), required), },