From 0e45074ea57a8b4f287eb78b747079442b229753 Mon Sep 17 00:00:00 2001
From: trevor <a.choi@smartsoltech.kr>
Date: Wed, 25 Dec 2024 13:12:26 +0900
Subject: [PATCH] sadasd

---
 app_settings/app_settings.py | 16 +-----------
 app_settings/models.py       | 48 ------------------------------------
 2 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/app_settings/app_settings.py b/app_settings/app_settings.py
index 3dc28529..29e18a67 100644
--- a/app_settings/app_settings.py
+++ b/app_settings/app_settings.py
@@ -1,18 +1,8 @@
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 from .models import LocalDatabase
 from decouple import config
 from django.conf import settings
 from .models import LocalDatabase
-
-def load_database_settings():
-    # Загружаем настройки из базы данных
-=======
-from decouple import config
-from django.conf import settings
-=======
->>>>>>> pms_plugins
 from django.apps import apps
 
 def load_database_settings(databases):
@@ -21,8 +11,7 @@ def load_database_settings(databases):
     :param databases: Существующий словарь DATABASES
     """
     LocalDatabase = apps.get_model('app_settings', 'LocalDatabase')
-<<<<<<< HEAD
->>>>>>> antifraud
+
     local_db_settings = LocalDatabase.objects.all()
     
     for db in local_db_settings:
@@ -35,9 +24,6 @@ def load_database_settings(databases):
             'HOST': db.host,
             'PORT': db.port,
         }
-=======
->>>>>>> pms_plugins
-
     try:
         local_db_settings = LocalDatabase.objects.filter(is_active=True)
         for db in local_db_settings:
diff --git a/app_settings/models.py b/app_settings/models.py
index 3b09ccb2..41829fee 100644
--- a/app_settings/models.py
+++ b/app_settings/models.py
@@ -1,13 +1,7 @@
-<<<<<<< HEAD
-from django.db import models
-import pytz
-
-=======
 # settings/models.py
 
 from django.db import models
 import pytz
->>>>>>> antifraud
 class LocalDatabase(models.Model):
     name = models.CharField(max_length=255, verbose_name="Имя базы данных")
     host = models.CharField(max_length=255, verbose_name="Хост базы данных", default="localhost")
@@ -16,11 +10,7 @@ class LocalDatabase(models.Model):
     database = models.CharField(max_length=255, verbose_name="Название базы данных")
     password = models.CharField(max_length=255, verbose_name="Пароль базы данных")
     is_active = models.BooleanField(default=True, verbose_name="Активна ли база данных")
-<<<<<<< HEAD
-
-=======
     
->>>>>>> antifraud
     def __str__(self):
         return self.name
 
@@ -32,15 +22,6 @@ class TelegramSettings(models.Model):
     bot_token = models.CharField(max_length=255, help_text="Токен вашего бота Telegram")
     chat_id = models.CharField(max_length=255, help_text="ID чата для отправки сообщений")
     username = models.CharField(max_length=255, help_text="Имя пользователя для бота", blank=True, null=True)
-<<<<<<< HEAD
-
-    def __str__(self):
-        return f"Telegram Bot ({self.username})"
-
-    class Meta:
-        verbose_name = "Telegram"
-        verbose_name_plural = "Telegram"
-=======
     
     def __str__(self):
         return f"Telegram Bot ({self.username})"
@@ -49,7 +30,6 @@ class TelegramSettings(models.Model):
         verbose_name = "Telegram"
         verbose_name_plural = "Telegram"
         
->>>>>>> antifraud
 
 class EmailSettings(models.Model):
     smtp_server = models.CharField(max_length=255, help_text="SMTP сервер для отправки почты")
@@ -57,19 +37,11 @@ class EmailSettings(models.Model):
     smtp_user = models.CharField(max_length=255, help_text="Имя пользователя для SMTP")
     smtp_password = models.CharField(max_length=255, help_text="Пароль для SMTP")
     from_email = models.EmailField(help_text="Email для отправки сообщений")
-<<<<<<< HEAD
-
-    class Meta:
-        verbose_name = "E-mail"
-        verbose_name_plural = "E-mails"
-
-=======
     
     class Meta:
         verbose_name = "E-mail"
         verbose_name_plural = "E-mails"
     
->>>>>>> antifraud
     def __str__(self):
         return f"Email Settings for {self.from_email}"
 
@@ -79,15 +51,6 @@ class GlobalHotelSettings(models.Model):
     currency = models.CharField(max_length=3, help_text="Валюта")
     global_timezone = models.CharField(
         max_length=63,
-<<<<<<< HEAD
-        choices=[(tz, tz) for tz in pytz.all_timezones],
-        default='UTC',
-    )
-
-    def __str__(self):
-        return "Настройки отеля"
-
-=======
         choices=[(tz, tz) for tz in pytz.all_timezones],  # Список всех часовых поясов
         default='UTC',  # Значение по умолчанию
     )
@@ -95,7 +58,6 @@ class GlobalHotelSettings(models.Model):
     def __str__(self):
         return "Настройки отеля"
     
->>>>>>> antifraud
     class Meta:
         verbose_name = "Настройки отеля"
         verbose_name_plural = "Настройки отеля"
@@ -105,23 +67,13 @@ class GlobalSystemSettings(models.Model):
     system_version = models.CharField(max_length=255, help_text="Версия системы")
     server_timezone = models.CharField(
         max_length=63,
-<<<<<<< HEAD
-        choices=[(tz, tz) for tz in pytz.all_timezones],
-        default='UTC',
-    )
-
-=======
         choices=[(tz, tz) for tz in pytz.all_timezones],  # Список всех часовых поясов
         default='UTC',  # Значение по умолчанию
     )
->>>>>>> antifraud
     def __str__(self):
         return "Настройки системы"
 
     class Meta:
         verbose_name = "Настройки системы"
         verbose_name_plural = "Настройки системы"
-<<<<<<< HEAD
-=======
         
->>>>>>> antifraud