From 521f1a91f520d6234d085c70c6668a2b1cb9d830 Mon Sep 17 00:00:00 2001 From: mohsentaba Date: Tue, 30 Jun 2026 14:18:42 +0330 Subject: [PATCH] courses pricing updated with only hving rub pricings --- apps/course/models/course.py | 13 +++---------- apps/course/serializers/admin.py | 6 +----- apps/course/views/course.py | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/apps/course/models/course.py b/apps/course/models/course.py index faf9641..c7269b6 100644 --- a/apps/course/models/course.py +++ b/apps/course/models/course.py @@ -417,24 +417,17 @@ class Course(models.Model): return self.__class__.recalculate_lessons_count_for_course(self.pk) def get_currency_for_language(self, lang): - normalized = (lang or 'en').lower() - if normalized.startswith('ru'): - return CURRENCY_RUB - return CURRENCY_USD + return CURRENCY_RUB def get_price_for_language(self, lang): if self.is_free: return Decimal('0.00') - if self.get_currency_for_language(lang) == CURRENCY_RUB: - return Decimal(self.price_rub or 0) - return Decimal(self.price or 0) + return Decimal(self.price_rub or 0) def get_final_price_for_language(self, lang): if self.is_free: return Decimal('0.00') - if self.get_currency_for_language(lang) == CURRENCY_RUB: - return Decimal(self.final_price_rub or 0) - return Decimal(self.final_price or 0) + return Decimal(self.final_price_rub or 0) def save(self, *args, **kwargs): diff --git a/apps/course/serializers/admin.py b/apps/course/serializers/admin.py index 45ab464..19b7454 100644 --- a/apps/course/serializers/admin.py +++ b/apps/course/serializers/admin.py @@ -146,10 +146,8 @@ class AdminCourseListSerializer(serializers.ModelSerializer): 'lessons_count', 'status', 'is_free', - 'price', 'price_rub', 'discount_percentage', - 'final_price', 'final_price_rub', 'participant_count', 'created_at' @@ -220,10 +218,8 @@ class AdminCourseDetailSerializer(serializers.ModelSerializer): 'short_description', 'status', 'is_free', - 'price', 'price_rub', 'discount_percentage', - 'final_price', 'final_price_rub', 'is_group_chat_locked', 'is_professor_chat_locked', @@ -233,7 +229,7 @@ class AdminCourseDetailSerializer(serializers.ModelSerializer): 'created_at', 'updated_at' ] - read_only_fields = ['id', 'final_price', 'final_price_rub', 'created_at', 'updated_at'] + read_only_fields = ['id', 'final_price_rub', 'created_at', 'updated_at'] def get_professor_name(self, obj): return ", ".join([p.fullname for p in obj.professors.all()]) diff --git a/apps/course/views/course.py b/apps/course/views/course.py index 8ee0b4e..1e35a7e 100644 --- a/apps/course/views/course.py +++ b/apps/course/views/course.py @@ -176,7 +176,7 @@ class CourseListAPIView(ListAPIView): if is_free := filters.get('is_free'): is_free = is_free.lower() == 'true' queryset = queryset.filter( - Q(is_free=is_free) | Q(price=0) if is_free else Q(is_free=False, price__gt=0) + Q(is_free=is_free) | Q(price_rub=0) if is_free else Q(is_free=False, price_rub__gt=0) ) if is_online := filters.get('is_online'): is_online = is_online.lower() == 'true'