From 0f089d7882c0cb62ea6101da7f08344ecf208a3f Mon Sep 17 00:00:00 2001
From: Bossanyi Tibor <sw@andio.biz>
Date: Sat, 30 Jan 2021 00:41:14 +0100
Subject: [PATCH] Product fix

---
 .../aitrainer_backoffice/admin.py             | 34 +------------------
 .../aitrainer_backoffice/models.py            |  4 +++
 .../aitrainer_backoffice/settings/dev.py      |  1 +
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/aitrainer_backoffice/aitrainer_backoffice/admin.py b/aitrainer_backoffice/aitrainer_backoffice/admin.py
index 8e30445..9bb9105 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/admin.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/admin.py
@@ -2,7 +2,7 @@ from django.contrib import admin
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 from .models import ExerciseType, ExerciseTypeAlternative, ExerciseTypeParents
-from .models import Product, Purchase, Property, PropertyTranslation
+from .models import Product
 from .models import ExerciseDevice, ExerciseDeviceTranslation, ExerciseTypeDevice, ExerciseDeviceAlternative
 from .models import ExerciseTypeImage
 from .models import ExerciseTypeTranslation
@@ -187,36 +187,6 @@ class ProductAdmin(admin.ModelAdmin):
     list_display = ('product_id', 'name', 'type')
 
 
-#  Product.objects.all().aggregate(Sum('price'))
-
-
-class PurchaseAdmin(admin.ModelAdmin):
-    list_display = ('purchase_id', 'product', 'customer_id', 'purchase_sum', 'currency', 'date_add')
-    list_filter = ['product']
-
-
-class TranslationPropertyInline(admin.TabularInline):
-    model = PropertyTranslation
-    fields = ('language_code', 'property_name')
-    extra = 0
-
-
-class PropertyAdmin(admin.ModelAdmin):
-    list_display = ('name_colored',)
-    search_fields = ['property_name']
-
-    def name_colored(self, obj):
-        color_code = '7bc863'
-        html = '<span style="color: #{};">{}</span>˓→'.format(color_code, obj.property_name)
-        return format_html(html)
-
-    name_colored.admin_order_field = 'property_name'
-
-    inlines = [
-        TranslationPropertyInline
-    ]
-
-
 class TranslationExerciseDeviceInline(admin.TabularInline):
     model = ExerciseDeviceTranslation
     fields = ('language_code', 'name')
@@ -254,7 +224,5 @@ admin.site.register(ExerciseTree, ExerciseTreeAdmin)
 admin.site.register(ExercisePlan, ExercisePlanAdmin)
 admin.site.register(ExercisePlanDetail, ExercisePlanDetailAdmin)
 admin.site.register(Product, ProductAdmin)
-admin.site.register(Purchase, PurchaseAdmin)
-admin.site.register(Property, PropertyAdmin)
 admin.site.register(ExerciseDevice, ExerciseDeviceAdmin)
 admin.autodiscover()
diff --git a/aitrainer_backoffice/aitrainer_backoffice/models.py b/aitrainer_backoffice/aitrainer_backoffice/models.py
index 4955d71..012e6e3 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/models.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/models.py
@@ -285,6 +285,10 @@ class Product(models.Model):
     type = models.CharField(max_length=15, choices=ProductTypes.choices, default=ProductTypes.SUBS)
     valid_from = models.DateField(blank=True, null=True)
     valid_to = models.DateField(blank=True, null=True)
+    product_id_ios = models.CharField(max_length=50,blank=True, null=True)
+    product_id_android = models.CharField(max_length=50,blank=True, null=True)
+    price_ios = models.DecimalField(max_length=12, decimal_places=2, max_digits=12, blank=True)
+    price_android = models.DecimalField(max_length=12, decimal_places=2, max_digits=12, blank=True)
 
     class Meta:
         db_table = 'product'
diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py b/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
index 3c587b5..0d218d8 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
@@ -123,6 +123,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 
 STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
 
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')