QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-06-05 09:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configurations cleanup & database configurations for mail and pdfs (#479)

Browse Source 
* Move Mail, PDF configuration to Database, standardize configurations

* Set default currency to USD on install

* Pint code
This commit is contained in:
Darko Gjorgjijoski
2025-09-19 15:42:53 +02:00
committed by GitHub
parent 3da86965e1
commit 18d63a3375
24 changed files with 943 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
app/Http/Requests/MailEnvironmentRequest.php
View File

@@ -33,10 +33,34 @@ class MailEnvironmentRequest extends FormRequest
'mail_port' => [
'required',
],
'mail_username' => [
'nullable',
'string',
],
'mail_password' => [
'nullable',
'string',
],
'mail_encryption' => [
'nullable',
'string',
],
'mail_scheme' => [
'nullable',
'string',
],
'mail_url' => [
'nullable',
'string',
],
'mail_timeout' => [
'nullable',
'integer',
],
'mail_local_domain' => [
'nullable',
'string',
],
'from_name' => [
'required',
'string',
@@ -44,11 +68,10 @@ class MailEnvironmentRequest extends FormRequest
'from_mail' => [
'required',
'string',
'email',
],
];
break;
case 'mailgun':
return [
'mail_driver' => [
@@ -64,43 +87,10 @@ class MailEnvironmentRequest extends FormRequest
'string',
],
'mail_mailgun_endpoint' => [
'required',
'nullable',
'string',
],
'from_name' => [
'required',
'string',
],
'from_mail' => [
'required',
'string',
],
];
break;
case 'ses':
return [
'mail_driver' => [
'required',
'string',
],
'mail_host' => [
'required',
'string',
],
'mail_port' => [
'required',
],
'mail_ses_key' => [
'required',
'string',
],
'mail_ses_secret' => [
'required',
'string',
],
'mail_encryption' => [
'mail_mailgun_scheme' => [
'nullable',
'string',
],
@@ -111,13 +101,28 @@ class MailEnvironmentRequest extends FormRequest
'from_mail' => [
'required',
'string',
'email',
],
];
break;
case 'mail':
case 'ses':
return [
'mail_driver' => [
'required',
'string',
],
'mail_ses_key' => [
'required',
'string',
],
'mail_ses_secret' => [
'required',
'string',
],
'mail_ses_region' => [
'nullable',
'string',
],
'from_name' => [
'required',
'string',
@@ -125,13 +130,20 @@ class MailEnvironmentRequest extends FormRequest
'from_mail' => [
'required',
'string',
'email',
],
];
break;
case 'sendmail':
return [
'mail_driver' => [
'required',
'string',
],
'mail_sendmail_path' => [
'nullable',
'string',
],
'from_name' => [
'required',
'string',
@@ -139,10 +151,26 @@ class MailEnvironmentRequest extends FormRequest
'from_mail' => [
'required',
'string',
'email',
],
];
break;
default:
return [
'mail_driver' => [
'required',
'string',
],
'from_name' => [
'required',
'string',
],
'from_mail' => [
'required',
'string',
'email',
],
];
}
}
}

17
app/Http/Requests/PDFConfigurationRequest.php
View File

@@ -27,7 +27,6 @@ class PDFConfigurationRequest extends FormRequest
'string',
],
];
break;
case 'gotenberg':
return [
@@ -40,18 +39,28 @@ class PDFConfigurationRequest extends FormRequest
'url',
],
'gotenberg_papersize' => [
'required',
'string',
function ($attribute, $value, $fail) {
($attribute); // unused
$reg = "/^\d+(pt|px|pc|mm|cm|in) \d+(pt|px|pc|mm|cm|in)$/";
if (! preg_match($reg, $value)) {
$fail('Invalid papersize, must be in format "210mm 297mm". Accepts: pt,px,pc,mm,cm,in');
}
},
],
'gotenberg_margins' => [
'nullable',
'string',
],
];
break;
default:
return [
'pdf_driver' => [
'required',
'string',
],
];
}
throw new \InvalidArgumentException('Invalid PDFDriver requested');
}
}