merge antifraud

app_settings/admin.py

@@ -1,9 +1,15 @@
+<<<<<<< HEAD
+=======
+# settings/admin.py
+
+>>>>>>> antifraud
 from django.contrib import admin
 from .models import LocalDatabase, GlobalHotelSettings, GlobalSystemSettings, TelegramSettings, EmailSettings
 
 @admin.register(LocalDatabase)
 class LocalDatabaseAdmin(admin.ModelAdmin):
     list_display = ['name', 'host', 'port', 'user', 'database', 'is_active']
+<<<<<<< HEAD
     search_fields = ['name', 'host', 'user', 'database']
 
 @admin.register(GlobalHotelSettings)
@@ -22,3 +28,23 @@ class TelegramSettingsAdmin(admin.ModelAdmin):
 @admin.register(EmailSettings)
 class EmailSettingsAdmin(admin.ModelAdmin):
     list_display = ['smtp_server', 'smtp_port', 'smtp_user', 'from_email']
+=======
+    search_fields = ['name', 'host','user', 'database']
+
+
+admin.site.register(GlobalHotelSettings)
+class GlobalHotelSettingsAdmin(admin.ModelAdmin):
+    list_display = ['checkin_time', 'checkout_time', 'global_timezone']
+    list_filter = ['global_timezone']
+    
+admin.site.register(GlobalSystemSettings)
+class GlobalSystemSettingsAdmin(admin.ModelAdmin):
+    list_display = ['system_name', 'system_version', 'server_timezone']
+admin.site.register(TelegramSettings)
+class TelegramSettingsAdmin(admin.ModelAdmin):
+    list_display = ['bot_token', 'bot_username']
+    
+admin.site.register(EmailSettings)  # Register your models here.
+class EmailSettingsAdmin(admin.ModelAdmin):
+    list_display = ['email_host', 'email_port', 'email_host_user', 'email_host_password']
+>>>>>>> antifraud

app_settings/app_settings.py

@@ -1,5 +1,6 @@
 # settings.py
 
+<<<<<<< HEAD
 from .models import LocalDatabase
 from decouple import config
 from django.conf import settings
@@ -7,6 +8,15 @@ from .models import LocalDatabase
 
 def load_database_settings():
     # Загружаем настройки из базы данных
+=======
+from decouple import config
+from django.conf import settings
+from django.apps import apps
+
+def load_database_settings():
+    # Загружаем настройки из базы данных
+    LocalDatabase = apps.get_model('app_settings', 'LocalDatabase')
+>>>>>>> antifraud
     local_db_settings = LocalDatabase.objects.all()
     
     for db in local_db_settings:

app_settings/apps.py

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 from django.apps import AppConfig, apps
 
 class AppSettingsConfig(AppConfig):
@@ -12,3 +13,12 @@ class AppSettingsConfig(AppConfig):
             import app_settings.signals  # Регистрация сигналов
         except ImportError as e:
             print(f"Ошибка импорта signals: {e}")
+=======
+from django.apps import AppConfig
+
+
+class SettingsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'app_settings'
+    verbose_name="Настройки системы"
+>>>>>>> antifraud

app_settings/migrations/0001_initial.py

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Generated by Django 5.1.4 on 2024-12-20 11:29
+=======
+# Generated by Django 5.1.4 on 2024-12-23 00:57
+>>>>>>> antifraud
 
 from django.db import migrations, models
 

app_settings/models.py

@@ -1,6 +1,13 @@
+<<<<<<< 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")
@@ -9,7 +16,11 @@ 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
 
@@ -21,6 +32,7 @@ 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})"
@@ -28,6 +40,16 @@ class TelegramSettings(models.Model):
     class Meta:
         verbose_name = "Telegram"
         verbose_name_plural = "Telegram"
+=======
+    
+    def __str__(self):
+        return f"Telegram Bot ({self.username})"
+    
+    class Meta:
+        verbose_name = "Telegram"
+        verbose_name_plural = "Telegram"
+        
+>>>>>>> antifraud
 
 class EmailSettings(models.Model):
     smtp_server = models.CharField(max_length=255, help_text="SMTP сервер для отправки почты")
@@ -35,11 +57,19 @@ 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}"
 
@@ -49,6 +79,7 @@ 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',
     )
@@ -56,6 +87,15 @@ class GlobalHotelSettings(models.Model):
     def __str__(self):
         return "Настройки отеля"
 
+=======
+        choices=[(tz, tz) for tz in pytz.all_timezones],  # Список всех часовых поясов
+        default='UTC',  # Значение по умолчанию
+    )
+    
+    def __str__(self):
+        return "Настройки отеля"
+    
+>>>>>>> antifraud
     class Meta:
         verbose_name = "Настройки отеля"
         verbose_name_plural = "Настройки отеля"
@@ -65,13 +105,23 @@ 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