heymlz/hossein-por-shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
marzban-dev
2025-02-06 22:55:45 +03:30
parent 865fc12cbe ff0f621450
commit 885f83d677
5 changed files with 214 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/order/migrations/0003_alter_orderitemmodel_product.py
+20
View File
@@ -0,0 +1,20 @@
# Generated by Django 5.1.2 on 2025-02-06 17:55
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('order', '0002_alter_discountcode_expiration_date_and_more'),
('product', '0015_attributetype_productdetailcategory_attributevalue_and_more'),
]
operations = [
migrations.AlterField(
model_name='orderitemmodel',
name='product',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='product.productmodel', verbose_name='محصول'),
),
]
backend/product/admin.py
+73 -12
View File
@@ -11,6 +11,20 @@ from unfold.widgets import (
)
from unfold.decorators import action, display
@admin.register(ProductDetailCategory)
class ProductDetailCategoryAdmin(ModelAdmin, ImportExportModelAdmin):
import_form_class = ImportForm
export_form_class = ExportForm
search_fields = ['title']
compressed_fields = True
warn_unsaved_form = True
formfield_overrides = {
ArrayField: {
"widget": ArrayWidget,
}
}
@admin.register(InPackItems)
class InPackItemsAdmin(ModelAdmin, ImportExportModelAdmin):
import_form_class = ImportForm
@@ -24,15 +38,61 @@ class InPackItemsAdmin(ModelAdmin, ImportExportModelAdmin):
"widget": ArrayWidget,
}
}
class InStuckColorsInLine(TabularInline):
model = InStuckColors
extra = 0
tab = True
@admin.register(AttributeType)
class AttributeTypeAdmin(ModelAdmin, ImportExportModelAdmin):
import_form_class = ImportForm
export_form_class = ExportForm
search_fields = ['name']
compressed_fields = True
warn_unsaved_form = True
formfield_overrides = {
models.CharField: {"widget": UnfoldAdminColorInputWidget()},
ArrayField: {
"widget": ArrayWidget,
}
}
verbose_name = 'رنگ موجود'
verbose_name_plural = 'رنگ‌های موجود'
@admin.register(AttributeValue)
class AttributeValueAdmin(ModelAdmin, ImportExportModelAdmin):
import_form_class = ImportForm
export_form_class = ExportForm
search_fields = ['value']
compressed_fields = True
warn_unsaved_form = True
formfield_overrides = {
ArrayField: {
"widget": ArrayWidget,
}
}
def get_form(self, request, obj=None, change=False, **kwargs):
form = super().get_form(request, obj, change, **kwargs)
form.base_fields["color"].widget = UnfoldAdminColorInputWidget()
return form
class ProductVariantInLine(StackedInline):
model = ProductVariant
extra = 0
show_change_link = True
tab = True
autocomplete_fields = ['attributes']
# search_fields = ['']
def get_form(self, request, obj=None, change=False, **kwargs):
form = super().get_form(request, obj, change, **kwargs)
form.base_fields["color"].widget = UnfoldAdminColorInputWidget()
return form
@admin.register(DetailModel)
@@ -55,20 +115,21 @@ class DetailModelAdmin(ModelAdmin, ImportExportModelAdmin):
class DetailModelInLine(StackedInline):
model = ProductDetailModel
extra = 0
show_change_link = True
tab = True
autocomplete_fields = ['detail']
verbose_name = 'جزئیات محصول'
verbose_name_plural = 'جزئیات محصول'
autocomplete_fields = ['detail', 'detail_category']
@admin.register(ProductModel)
class ProductModelAdmin(ModelAdmin, ImportExportModelAdmin):
import_form_class = ImportForm
export_form_class = ExportForm
inlines = [InStuckColorsInLine, DetailModelInLine]
inlines = [ProductVariantInLine, DetailModelInLine]
readonly_fields = ('slug', )
search_fields = ['name', 'description', ]
list_filter = ['currency', 'show', 'category']
autocomplete_fields = ['related_products', 'in_pack_items']
autocomplete_fields = ['related_products', 'in_pack_items',]
# compressed_fields = True
warn_unsaved_form = True
list_display = ['display_image', 'display_price', 'view', 'show', 'rating', 'category', 'discount', 'sell']
backend/product/migrations/0015_attributetype_productdetailcategory_attributevalue_and_more.py
+70
View File
@@ -0,0 +1,70 @@
# Generated by Django 5.1.2 on 2025-02-06 17:55
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('product', '0014_inpackitems_alter_productdetailmodel_product_and_more'),
]
operations = [
migrations.CreateModel(
name='AttributeType',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100, verbose_name='نام نوع اتربیوت')),
],
),
migrations.CreateModel(
name='ProductDetailCategory',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=40, verbose_name='عنوان')),
],
options={
'verbose_name': 'دسته بندی جزيات',
'verbose_name_plural': 'دسته بندی های جزيیات',
},
),
migrations.CreateModel(
name='AttributeValue',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('value', models.CharField(max_length=100, verbose_name='مقدار نوع اتربیوت')),
('color', models.CharField(blank=True, max_length=7, null=True, verbose_name='رنک')),
('attribute_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='product.attributetype')),
],
options={
'unique_together': {('attribute_type', 'value')},
},
),
migrations.AddField(
model_name='productdetailmodel',
name='detail_category',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='product.productdetailcategory', verbose_name='دسته بندی جزيات'),
),
migrations.AlterUniqueTogether(
name='productdetailmodel',
unique_together={('product', 'detail_category')},
),
migrations.CreateModel(
name='ProductVariant',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('in_stock', models.PositiveIntegerField(default=0, verbose_name='تعداد موجود')),
('price', models.PositiveIntegerField(blank=True, null=True, verbose_name='قیمت (اختیاری)')),
('attributes', models.ManyToManyField(to='product.attributevalue', verbose_name='ویژگی\u200cها')),
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='variants', to='product.productmodel', verbose_name='محصول')),
],
options={
'verbose_name': 'تنوع محصول',
'verbose_name_plural': 'تنوع\u200cهای محصول',
},
),
migrations.DeleteModel(
name='InStuckColors',
),
]
backend/product/models.py
+46 -11
View File
@@ -181,28 +181,31 @@ class DetailModel(models.Model):
verbose_name_plural = 'مدل های جزیات'
class ProductDetailCategory(models.Model):
title = models.CharField(max_length=40, verbose_name='عنوان')
def __str__(self):
return self.title
class Meta:
verbose_name = 'دسته بندی جزيات'
verbose_name_plural = 'دسته بندی های جزيیات'
class ProductDetailModel(models.Model):
product = models.ForeignKey(ProductModel, on_delete=models.CASCADE, verbose_name='محصول مرتبط', related_name='details')
detail_category = models.ForeignKey(ProductDetailCategory, on_delete=models.CASCADE, verbose_name='دسته بندی جزيات', blank=True, null=True)
detail = models.ManyToManyField(DetailModel, verbose_name='جزيات ها')
class Meta:
verbose_name = 'جزیات محصول'
verbose_name_plural = 'جزیات محصول ها'
unique_together = ('product', 'detail_category')
def __str__(self):
return f'جزيیات محصول {self.product}'
class InStuckColors(models.Model):
color = models.CharField(_("رنگ"), null=True, blank=True, max_length=255)
in_stuck = models.PositiveIntegerField(default=0, verbose_name="تعداد موجود")
product = models.ForeignKey(ProductModel, on_delete=models.CASCADE, related_name='colors', verbose_name='محصول')
class Meta:
verbose_name = 'تعداد موجود رنگ'
verbose_name_plural = 'تعداد موجود رنگ ها'
def __str__(self):
return f'{self.product} - {self.color}'
class CommentModel(models.Model):
product = models.ForeignKey(ProductModel, on_delete=models.CASCADE, related_name='comments', verbose_name='محصول')
@@ -214,4 +217,36 @@ class CommentModel(models.Model):
verbose_name = 'نظر'
verbose_name_plural = 'نظرات'
def __str__(self):
return f"{self.user}-{self.content[:30]}"
return f"{self.user}-{self.content[:30]}"
class AttributeType(models.Model):
name = models.CharField(verbose_name='نام نوع اتربیوت', max_length=100)
def __str__(self):
return self.name
class AttributeValue(models.Model):
attribute_type = models.ForeignKey(AttributeType, on_delete=models.CASCADE)
value = models.CharField(verbose_name='مقدار نوع اتربیوت', max_length=100)
color = models.CharField(verbose_name='رنک', max_length=7, blank=True, null=True)
class Meta:
unique_together = ('attribute_type', 'value')
def __str__(self):
return f"{self.attribute_type.name}: {self.value}"
class ProductVariant(models.Model):
product = models.ForeignKey(ProductModel, on_delete=models.CASCADE, related_name='variants', verbose_name='محصول')
attributes = models.ManyToManyField(AttributeValue, verbose_name='ویژگی‌ها')
in_stock = models.PositiveIntegerField(default=0, verbose_name='تعداد موجود')
price = models.PositiveIntegerField(null=True, blank=True, verbose_name='قیمت (اختیاری)')
class Meta:
verbose_name = 'تنوع محصول'
verbose_name_plural = 'تنوع‌های محصول'
def __str__(self):
return f"{self.product.name} - {', '.join(str(attr) for attr in self.attributes.all())}"
backend/product/serializers.py
+5 -8
View File
@@ -4,10 +4,7 @@ from django.utils import timezone
from datetime import timedelta
class InStuckColorsSerializer(serializers.ModelSerializer):
class Meta:
model = InStuckColors
fields = ['color', 'in_stuck']
class DetailSerializer(serializers.ModelSerializer):
@@ -24,7 +21,7 @@ class ProductDetailSerializer(serializers.ModelSerializer):
class DynamicProductSerializer(serializers.ModelSerializer):
colors = InStuckColorsSerializer(many=True, read_only=True)
price = serializers.SerializerMethodField()
is_new = serializers.SerializerMethodField()
related_products = serializers.SerializerMethodField()
@@ -45,9 +42,9 @@ class DynamicProductSerializer(serializers.ModelSerializer):
model = ProductModel
fields = "__all__"
view_type = {
'list': ['name', 'price', 'image1', 'video', 'rating', 'discount', 'slug', 'category', 'colors'],
'instance': ['name', 'description', 'price', 'image1', 'image2', 'image3', 'video', 'rating', 'discount', 'slug', 'meta_description', 'meta_keywords', 'meta_rating', 'category', 'colors', 'related_products', 'details', 'in_pack_items'],
'chat': ['name', 'description', 'price', 'in_stock', 'discount', 'colors']
'list': ['name', 'price', 'image1', 'video', 'rating', 'discount', 'slug', 'category', ],
'instance': ['name', 'description', 'price', 'image1', 'image2', 'image3', 'video', 'rating', 'discount', 'slug', 'meta_description', 'meta_keywords', 'meta_rating', 'category', 'related_products', 'details', 'in_pack_items'],
'chat': ['name', 'description', 'price', 'in_stock', 'discount', ]
}
def get_price(self, obj):