added new fields
This commit is contained in:
@@ -10,5 +10,5 @@ class OrderItemInline(admin.TabularInline):
|
||||
|
||||
@admin.register(Order)
|
||||
class OrderAdmin(admin.ModelAdmin):
|
||||
list_display = ['id', 'user', 'total_price']
|
||||
list_display = ['id', 'user', 'total_price', 'status']
|
||||
inlines = [OrderItemInline]
|
||||
18
core/apps/orders/migrations/0011_order_status.py
Normal file
18
core/apps/orders/migrations/0011_order_status.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 5.2 on 2025-11-21 16:35
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('orders', '0010_remove_order_address'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='order',
|
||||
name='status',
|
||||
field=models.CharField(choices=[('NEW', 'yangi'), ('DONE', 'tayyor')], default='NEW', max_length=20),
|
||||
),
|
||||
]
|
||||
@@ -15,6 +15,10 @@ class Order(BaseModel):
|
||||
('DELIVERY_COURIES', 'kuryer orqali yetkazib berish'),
|
||||
('PICKUP', 'olib ketish'),
|
||||
)
|
||||
STATUS = (
|
||||
('NEW', 'yangi'),
|
||||
('DONE', 'tayyor'),
|
||||
)
|
||||
|
||||
total_price = models.PositiveBigIntegerField(default=0)
|
||||
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='orders')
|
||||
@@ -25,6 +29,7 @@ class Order(BaseModel):
|
||||
contact_number = models.CharField(max_length=15, null=True, blank=True)
|
||||
comment = models.CharField(max_length=500, null=True, blank=True)
|
||||
name = models.CharField(max_length=200, null=True, blank=True)
|
||||
status = models.CharField(max_length=20, choices=STATUS, default='NEW')
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.user} order'
|
||||
|
||||
@@ -88,6 +88,6 @@ class OrderListSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Order
|
||||
fields = [
|
||||
'id', 'order_number', 'total_price', 'payment_type', 'delivery_type', 'delivery_price',
|
||||
'id', 'order_number', 'status', 'total_price', 'payment_type', 'delivery_type', 'delivery_price',
|
||||
'contact_number', 'comment', 'name', 'items', 'created_at'
|
||||
]
|
||||
@@ -7,7 +7,7 @@ from core.apps.orders.serializers import order as serializers
|
||||
|
||||
class OrderCreateApiView(generics.GenericAPIView):
|
||||
serializer_class = serializers.OrderCreateSerializer
|
||||
queryset = Order.objects.all()
|
||||
queryset = Order.objects.order_by('status')
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
|
||||
def post(self, request):
|
||||
|
||||
Reference in New Issue
Block a user