This commit is contained in:
Bossanyi Tibor 2020-11-04 17:41:41 +01:00
parent e5e29420a7
commit 29f84abb88
2 changed files with 6 additions and 5 deletions

View File

@ -2,7 +2,7 @@ from django.contrib import admin
from django.db.models import Sum from django.db.models import Sum
from django.utils.html import format_html from django.utils.html import format_html
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from .models import ExerciseType, Product, CustomerProduct from .models import ExerciseType, Product, Purchase
from .models import ExerciseTypeImage from .models import ExerciseTypeImage
from .models import ExerciseTypeTranslation from .models import ExerciseTypeTranslation
from .models import ExerciseTreeTranslation from .models import ExerciseTreeTranslation
@ -136,7 +136,8 @@ class ProductAdmin(admin.ModelAdmin):
list_display = ('product_id', 'name', 'type') list_display = ('product_id', 'name', 'type')
# Product.objects.all().aggregate(Sum('price')) # Product.objects.all().aggregate(Sum('price'))
class CustomerProductAdmin(admin.ModelAdmin):
class PurchaseAdmin(admin.ModelAdmin):
list_display = ('id', 'product', 'customer_id', 'purchase_sum', 'currency', 'date_add') list_display = ('id', 'product', 'customer_id', 'purchase_sum', 'currency', 'date_add')
list_filter = ['product'] list_filter = ['product']
@ -146,6 +147,6 @@ admin.site.register(ExerciseTree, ExerciseTreeAdmin)
admin.site.register(ExercisePlan, ExercisePlanAdmin) admin.site.register(ExercisePlan, ExercisePlanAdmin)
admin.site.register(ExercisePlanDetail, ExercisePlanDetailAdmin) admin.site.register(ExercisePlanDetail, ExercisePlanDetailAdmin)
admin.site.register(Product, ProductAdmin) admin.site.register(Product, ProductAdmin)
admin.site.register(CustomerProduct, CustomerProductAdmin) admin.site.register(Purchase, PurchaseAdmin)
admin.autodiscover() admin.autodiscover()

View File

@ -174,7 +174,7 @@ class Product(models.Model):
return self.name return self.name
class CustomerProduct(models.Model): class Purchase(models.Model):
id = models.AutoField(primary_key=True) id = models.AutoField(primary_key=True)
product = models.ForeignKey(Product, on_delete=models.CASCADE) product = models.ForeignKey(Product, on_delete=models.CASCADE)
customer_id = models.IntegerField() customer_id = models.IntegerField()
@ -183,6 +183,6 @@ class CustomerProduct(models.Model):
currency = models.CharField(max_length=3) currency = models.CharField(max_length=3)
class Meta: class Meta:
db_table = 'customer_product' db_table = 'Purchase'
verbose_name = _("Purchase") verbose_name = _("Purchase")
verbose_name_plural = _("Purchases") verbose_name_plural = _("Purchases")