From c37b0ed4b2ca5777b46a6e6401768283d838127a Mon Sep 17 00:00:00 2001
From: phzhik <phzhitnikov@gmail.com>
Date: Thu, 30 May 2024 21:01:30 +0400
Subject: [PATCH] * Updated field naming in some serializers * Admin tweaks *
 Settings editing only for admin

---
 core/serializers.py  | 9 +++++----
 core/views.py        | 4 ++--
 store/admin.py       | 2 +-
 store/serializers.py | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/serializers.py b/core/serializers.py
index 7201092..64143f9 100644
--- a/core/serializers.py
+++ b/core/serializers.py
@@ -7,13 +7,14 @@ from poizonstore.utils import PriceField
 class GlobalSettingsSerializer(serializers.ModelSerializer):
     yuan_rate = PriceField(source='full_yuan_rate', read_only=True)
     yuan_rate_commission = PriceField()
-    chinadelivery = PriceField(source='delivery_price_CN')
-    commission = PriceField(source='commission_rub')
-    pickup = serializers.CharField(source='pickup_address')
+    delivery_price_CN = PriceField()
+    commission_rub = PriceField()
+    pickup_address = serializers.CharField()
 
     class Meta:
         model = GlobalSettings
-        fields = ('yuan_rate', 'yuan_rate_last_updated', 'yuan_rate_commission', 'commission',  'chinadelivery', 'pickup', 'time_to_buy')
+        fields = ('yuan_rate', 'yuan_rate_last_updated', 'yuan_rate_commission',
+                  'commission_rub',  'delivery_price_CN', 'pickup_address', 'time_to_buy')
         read_only_fields = ('yuan_rate_last_updated',)
 
 
diff --git a/core/views.py b/core/views.py
index e67ac6c..479c0d2 100644
--- a/core/views.py
+++ b/core/views.py
@@ -1,13 +1,13 @@
 from rest_framework import generics
 
-from account.permissions import IsManager, ReadOnly
+from account.permissions import ReadOnly, IsAdmin
 from core.models import GlobalSettings
 from core.serializers import GlobalSettingsSerializer, AnonymousGlobalSettingsSerializer
 
 
 class GlobalSettingsAPI(generics.RetrieveUpdateAPIView):
     serializer_class = GlobalSettingsSerializer
-    permission_classes = [IsManager | ReadOnly]
+    permission_classes = [IsAdmin | ReadOnly]
 
     def get_serializer_class(self):
         if getattr(self.request.user, 'is_manager', False):
diff --git a/store/admin.py b/store/admin.py
index 9c4f236..12f44c2 100644
--- a/store/admin.py
+++ b/store/admin.py
@@ -18,7 +18,7 @@ class ImageAdmin(admin.ModelAdmin):
 
 @admin.register(Checklist)
 class ChecklistAdmin(admin.ModelAdmin):
-    list_display = ('id', 'brand', 'model', 'price_rub', 'commission_rub', 'full_price', 'date', 'status_display')
+    list_display = ('id', 'brand', 'model', 'price_rub', 'commission_rub', 'full_price', 'date', 'status_display', 'customer')
     ordering = ('-status_updated_at', '-created_at')
 
     @display(description='Статус')
diff --git a/store/serializers.py b/store/serializers.py
index 305e697..b60cab1 100644
--- a/store/serializers.py
+++ b/store/serializers.py
@@ -38,11 +38,11 @@ class CategoryChecklistSerializer(serializers.ModelSerializer):
 
 
 class CategorySerializer(serializers.ModelSerializer):
-    chinarush = PriceField(source='delivery_price_CN_RU')
+    delivery_price_CN_RU = PriceField()
 
     class Meta:
         model = Category
-        fields = ('id', 'name', 'chinarush', 'commission')
+        fields = ('id', 'name', 'delivery_price_CN_RU', 'commission')
 
 
 class CategoryFullSerializer(CategorySerializer):