This commit is contained in:
Iliyan Angelov
2025-11-20 02:18:52 +02:00
parent 34b4c969d4
commit 44e11520c5
55 changed files with 4741 additions and 876 deletions

View File

@@ -25,7 +25,15 @@ class ContactForm(BaseModel):
def get_admin_email(db: Session) -> str:
"""Get admin email from system settings or find admin user"""
# First, try to get from system settings
# First, try to get from company_email (company settings)
company_email_setting = db.query(SystemSettings).filter(
SystemSettings.key == "company_email"
).first()
if company_email_setting and company_email_setting.value:
return company_email_setting.value
# Second, try to get from admin_email (legacy setting)
admin_email_setting = db.query(SystemSettings).filter(
SystemSettings.key == "admin_email"
).first()
@@ -52,7 +60,7 @@ def get_admin_email(db: Session) -> str:
# Last resort: raise error
raise HTTPException(
status_code=500,
detail="Admin email not configured. Please set admin_email in system settings or ensure an admin user exists."
detail="Admin email not configured. Please set company_email in system settings or ensure an admin user exists."
)