settings application

.env db params+global settings in admin model
ECVI plugin module

hotels/admin.py

@@ -27,8 +27,8 @@ class HotelForm(forms.ModelForm):
 
 @admin.register(Hotel)
 class HotelAdmin(admin.ModelAdmin):
-    list_display = ['name', 'pms', 'sync_button']
-
+    list_display = ['name', 'hotel_id', 'pms', 'timezone', 'description']
+    list_filter = ['name', 'pms', 'timezone']
     def sync_button(self, obj):
         return format_html(
             '<a class="button" href="{}">Синхронизировать</a>',

hotels/migrations/0006_remove_hotel_api_remove_hotel_import_status_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.1.4 on 2024-12-14 00:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hotels', '0005_hotel_import_status_hotel_imported_at_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='hotel',
+            name='api',
+        ),
+        migrations.RemoveField(
+            model_name='hotel',
+            name='import_status',
+        ),
+        migrations.RemoveField(
+            model_name='hotel',
+            name='imported_at',
+        ),
+        migrations.RemoveField(
+            model_name='hotel',
+            name='imported_from',
+        ),
+    ]

hotels/migrations/0007_hotel_hotel_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2024-12-14 02:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hotels', '0006_remove_hotel_api_remove_hotel_import_status_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hotel',
+            name='hotel_id',
+            field=models.CharField(blank=True, max_length=255, null=True, unique=True, verbose_name='ID отеля'),
+        ),
+    ]

hotels/migrations/0008_hotel_address_hotel_city_hotel_email_hotel_phone_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.1.4 on 2024-12-14 02:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hotels', '0007_hotel_hotel_id'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hotel',
+            name='address',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Адрес'),
+        ),
+        migrations.AddField(
+            model_name='hotel',
+            name='city',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Город'),
+        ),
+        migrations.AddField(
+            model_name='hotel',
+            name='email',
+            field=models.EmailField(blank=True, max_length=254, null=True, verbose_name='Email'),
+        ),
+        migrations.AddField(
+            model_name='hotel',
+            name='phone',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Телефон'),
+        ),
+        migrations.AddField(
+            model_name='hotel',
+            name='timezone',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Часовой пояс'),
+        ),
+    ]

hotels/migrations/0009_hotel_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2024-12-14 02:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hotels', '0008_hotel_address_hotel_city_hotel_email_hotel_phone_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hotel',
+            name='description',
+            field=models.TextField(blank=True, null=True, verbose_name='Описание'),
+        ),
+    ]

hotels/models.py

@@ -17,18 +17,24 @@ class APIConfiguration(models.Model):
         verbose_name = "Конфигурация API"
         verbose_name_plural = "Конфигурации API"
 
+import pytz
 
 class Hotel(models.Model):
+    id = models.BigAutoField(primary_key=True, auto_created=True, verbose_name="ID")
     name = models.CharField(max_length=255, verbose_name="Название отеля")
-    api = models.OneToOneField(
-        APIConfiguration,
-        on_delete=models.SET_NULL,
-        null=True,
-        blank=True,
-        verbose_name="API",
-        help_text="API, связанный с этим отелем."
-    )
+    hotel_id = models.CharField(max_length=255, unique=True, null=True, blank=True, verbose_name="ID отеля")
     created_at = models.DateTimeField(auto_now_add=True, verbose_name="Создан")
+    phone= models.CharField(max_length=50, null=True, blank=True, verbose_name="Телефон")
+    email = models.EmailField(null=True, blank=True, verbose_name="Email")
+    address = models.CharField(max_length=255, null=True, blank=True, verbose_name="Адрес")
+    city = models.CharField(max_length=255, null=True, blank=True, verbose_name="Город")
+    timezone = models.CharField(
+        max_length=63,
+        choices=[(tz, tz) for tz in pytz.all_timezones],  # Список всех часовых поясов
+        default='UTC',  # Значение по умолчанию
+    )
+    description = models.TextField(null=True, blank=True, verbose_name="Описание")
+    
     pms = models.ForeignKey(
         'pms_integration.PMSConfiguration',  
         on_delete=models.SET_NULL,
@@ -86,6 +92,7 @@ class APIRequestLog(models.Model):
 
 
 class Reservation(models.Model):
+    id = models.BigAutoField(primary_key=True, auto_created=True, verbose_name="ID")
     hotel = models.ForeignKey(Hotel, on_delete=models.CASCADE, verbose_name="Отель")
     reservation_id = models.BigIntegerField(unique=True, verbose_name="ID бронирования")
     room_number = models.CharField(max_length=255, null=True, blank=True)