fix mailing an email

2026-06-23 08:05:51 +02:00
parent c5127da750
commit def8d22544
2479 changed files with 325393 additions and 781 deletions
@@ -15,7 +15,8 @@ class EmailSetting extends Model
    protected $fillable = [
        'imap_host', 'imap_port', 'imap_encryption', 'imap_username', 'imap_password',
        'smtp_host', 'smtp_port', 'smtp_encryption', 'smtp_username', 'smtp_password',
-        'email_address', 'email_name', 'reply_to', 'sync_interval_minutes',
+        'email_address', 'email_name', 'from_email', 'from_name', 'reply_to',
+        'sync_interval_minutes',
        'last_sync_at', 'is_active', 'signature', 'signature_enabled',
        'auth_method', 'google_oauth_connection_id',
    ];
@@ -247,4 +248,38 @@ class EmailSetting extends Model
    {
        return $this->signature;
    }
+
+    public function getEffectiveFromAddress(): string
+    {
+        return $this->from_email ?: $this->email_address;
+    }
+
+    public function getEffectiveFromName(): string
+    {
+        $name = $this->from_name ?: $this->email_name;
+        if (filter_var($name, FILTER_VALIDATE_EMAIL)) {
+            return 'Glastree';
+        }
+        $name = preg_replace('/[^\p{L}\p{N}\s]/u', '', $name);
+        $name = trim($name);
+        return empty($name) ? 'Glastree' : $name;
+    }
+
+    public function getEffectiveReplyTo(): ?string
+    {
+        if ($this->from_email) {
+            return $this->from_email;
+        }
+        return $this->reply_to ?: null;
+    }
+
+    public function firme(): HasMany
+    {
+        return $this->hasMany(Firma::class);
+    }
+
+    public function firmaPredefinita(): ?Firma
+    {
+        return $this->firme()->where('is_default', true)->first() ?? $this->firme()->first();
+    }
 }